Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I87313b00fc7435d079f0270cf0140dd57436e67a
tree: acfc8b558580f0421840af5f9e94b328e18c1a90
  1. src/
  2. Android.mk
  3. CleanSpec.mk