Reconcile with jb-mr1-release - do not merge

Change-Id: I17f75cece44e1e9dfe9707346ee7168ca0f0a654
tree: 6218316845ad145937fc082f7e16405f9fa7f665
  1. src/
  2. Android.mk
  3. CleanSpec.mk