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

Change-Id: I5aa73c3e5ad4fd272e182c5b46a6c71b4df77a46
tree: ecae3b1abaa57c09220319de58927782557558f3
  1. 4/
  2. 5/
  3. 6/
  4. 7/
  5. 8/
  6. Android.mk
  7. CleanSpec.mk