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

Bug: 120848293
Change-Id: If234c0ef3a02495160bc98b0af27badc93957ca7
tree: 3aabdd20423230016a83fe35d237e043355626cc
  1. Android.mk
  2. AndroidManifest.xml
  3. OWNERS
  4. res/
  5. src/
  6. tests/