Merge 23ad95221ada6235e2afcff64bc4353cf870aaad on remote branch

Change-Id: Icd466afe1cb047580e5a8eb7b53ecbf59c18538e
tree: 708b7aa45c6ee3f8359265753d30016196724443
  1. res/
  2. robotests/
  3. src/
  4. Android.bp
  5. AndroidManifest.xml
  6. CleanSpec.mk
  7. OWNERS