Merge a39d261b4fec56f6d40d0ba0bf0bc3e3aad1b8a3 on remote branch

Change-Id: If732854ef2f560cb4578d56cfcdbb7afa9350339
tree: de37dcef6ca4db1feaf28f2c84c34584ebc2265c
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. OWNERS