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

Bug: 120848293
Change-Id: I8a233d8c8427f0e24b01f86f1c00a03744b8971c
tree: b29fe046577f2c9fca0db332417f538f383e2d5e
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. OWNERS