[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 32555e2363  -s ours
am: ac950db1e3  -s ours

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