[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: f6b575edb3  -s ours
am: 7930a8528c  -s ours

Change-Id: I270c09dcb4adee2e61d4a4114bfb541b9b8e860e
tree: 1e83436dd03fa9ba8e78b81e00c8e507e3bd5f04
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE