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

Change-Id: Ia7aaa47f1bee01d0c566dd90475ea01c6a0b3534
tree: 706a65610cc67612d3d58758505d5274d5b1899f
  1. Android.bp
  2. AndroidManifest.xml
  3. NOTICE
  4. res/
  5. src/