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

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