Merge 078d31bbc6a2af757a4523c12af92f06f7056540 on remote branch

Change-Id: I0eea6aa719baf3d5701e620667c7ef141b137f19
tree: 6958bcc76b4425b782d9666f1979589e058108bd
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. CleanSpec.mk
  7. NOTICE
  8. OWNERS