Merge 7a134ad310da728170e57404a0945cc890785dc0 on remote branch

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