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

Change-Id: Iaffda05bc8f285a7b4fdb8477608f228a42733f6
tree: 7a6fcde317da44077cff3d763f6b2114549e34fa
  1. src/
  2. Android.mk
  3. CleanSpec.mk