Merge 6b28a0295722c6f0daa62183463be94dc621338b on remote branch

Change-Id: I081e94f82b64f16b8f311f03d450e992da96d37f
tree: 28bf6d52bca2fcd8f5752b18019cd618df59db2e
  1. src/
  2. Android.bp
  3. apkzlib.iml
  4. build.gradle
  5. METADATA
  6. OWNERS