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

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