Merge 9662b6dec34cd4a07ec9a855e890a0e3d856b2c4 on remote branch

Change-Id: I627dedc55a57a59309182fbbbb69ab89c5a72cb5
tree: aca057c986eff64ba4d2a1a04130e3542d534c59
  1. res/
  2. Android.bp
  3. AndroidManifest.xml
  4. CleanSpec.mk
  5. OWNERS