Merge c66f46a43d20e515165a9f0c05abc2d1dfe975b7 on remote branch

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