Merge ff3368b2b5674b9cebf5058d5e9e136d4bcfc71e on remote branch

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