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

Bug: 120848293
Change-Id: I0f7f35fdf688411a57bbd1d096212946aabbdcbc
tree: 0c27aadd054aa068f4d015b50387da5c4e220760
  1. res/
  2. sample/
  3. src/
  4. Android.bp
  5. AndroidManifest.xml