Merge QP1A.180823.001

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