Merge cdd6efd271660a5a70ebc5e1f4d7de3dce3ff8ec on remote branch

Change-Id: I7b58c264c4291073b311e59ae965a2e3aff13680
tree: 617cf534ca4fbd4c103f76136f54ac51571b31e8
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. proguard.flags