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

Change-Id: Ic06ba79213c8ce2c41c8282a333456fd8304636b
tree: c6f827a58b7a3662745289557272eb6f55ae7039
  1. src/
  2. Android.mk
  3. CleanSpec.mk