[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 29560e9fa9  -s ours
am: 819e21d51b  -s ours

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