[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
am: 359d972523  -s ours

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