Merge a7f51502e7065f6b96a4de4d64c360cfe869b7fe on remote branch

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