DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master

Bug: 120848293
Change-Id: Ia3d8833281724c7a202eb8beb13bb388e2c7e640
tree: 461925bdeb8ae4bfd8d0dcc2d9a96f636c5ef74c
  1. res/
  2. src/
  3. tests/
  4. tools/
  5. Android.mk
  6. AndroidManifest.xml
  7. CleanSpec.mk
  8. OWNERS