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

Change-Id: Ida148499f8c1a2e9a0994c3bcf5aab0ce57800e0
tree: 276700c41e6024497f1edb881fa936f39860b5e4
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml