[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
am: 1c8d588240  -s ours

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