[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
am: 3cb9d7362c -s ours
am skip reason: subject contains skip directive

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