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

Bug: 120848293
Change-Id: Ifd28bab426a29d2b55400cafc387e287a7e46b86
tree: 706a65610cc67612d3d58758505d5274d5b1899f
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. NOTICE