Merge e28c196037151bd3266e256f91824b40c6ba31ac on remote branch

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