Merge b9760a8874290410d216ef1f09fddb3b59c676f9 on remote branch

Change-Id: Ib49b05bd91e096a62698e9a22be55697f08ccd01
tree: 156e8bd7e9b689b3fad46ecfaca86ed3ea7e2e38
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. NOTICE
  7. OWNERS