[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 8b634e9191  -s ours am: 904d4df89a  -s ours
am: 0103338bfb  -s ours

Change-Id: I75b649236c9bc42d627dd79d055e38b26e20fa40
tree: a40e03335a764cf0f79f35860eff47dbe88b3ecf
  1. perf_tests/
  2. res/
  3. src/
  4. tests/
  5. Android.mk
  6. AndroidManifest.xml
  7. proguard.flags