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

Change-Id: I411b66412973e29d8f36470f5f768a4ee294f8bb
tree: fb8c24ec8cd57ae9b185fbf6833b9af3b203bfe7
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. build.gradle