Merge 65c0f7037eab83fedc9fa3b4773ddd2ada7cdc7f on remote branch

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