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

Change-Id: I244f7c87c8e997997a54c4f871fc6bfacc6a854f
tree: 527da8c5f3b8a8ef9685e3323453a087139f1767
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags