[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: 2c92799d99  -s ours
am: 44181d0555  -s ours

Change-Id: I209b3ad88b9194fd030599f6f2ec9c4abdedd155
tree: 4ac1345ffcf877632fd3ead9241d48fd447074a9
  1. Android.bp
  2. BUILD
  3. apkzlib.iml
  4. build.gradle
  5. src/