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

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