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

Change-Id: I3a0849be73ca3281ebdfd64fa7ec5adbbfb37b60
tree: 79813b6a37595debeeb0ab3110fdf93cb9c5cdde
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml