[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 7d4614c646  -s ours
am: 303cafdc7d  -s ours

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