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

Bug: 120848293
Change-Id: I68a740e3f1ece2e98324d933f1e2b71adb0ca1ea
tree: 31410771c98825bc1577deab0e160b868ac078ad
  1. Android.bp
  2. AndroidManifest.xml
  3. CleanSpec.mk
  4. OWNERS
  5. res/