Merge 35515c8a1da1cc3176aa14bd9b7bc4855d4b6358 on remote branch

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