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

Change-Id: I674846963db07579cf8b4c2ebc78d595a9311c7f
tree: d5944152a727a06bac6b49c9b8442d046fc6d81e
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS
  6. PREUPLOAD.cfg