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

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