[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
am: 67a89fe495  -s ours

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