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

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