Merge 10952656

Merged-In: I2496fd9c0b9b51d315e9e8c7da07543bcaff53e3
Change-Id: I5d8b2acf5aa30bbd4a3ace64d766e2475419e01c
tree: 326e0b6aa9f4633e2733eb4c7fb99abe12a9d45e
  1. res/
  2. robotests/
  3. src/
  4. Android.bp
  5. AndroidManifest.xml
  6. CleanSpec.mk
  7. OWNERS