Merge d137a17c589914ef498f76511146981f8067b5bb on remote branch

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