Merge ffb8580cf70bcb40d0c765c1e9d39c529be1af4f on remote branch

Change-Id: I1c7032af8e3028a8cf191c0aa01d2e71f46b9dd0
tree: 5f0f041910bc757977a78dde500ac0ced0b546f9
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. CleanSpec.mk
  7. NOTICE