Merge 84317fcf13fd016c6f4964ea87b089cc62ff5cbc on remote branch

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