Merge 4892ad815e1b6c866112062154802ba52177d77a on remote branch

Change-Id: I39db84548d5eea54fa111fa57d3df77a9e29ac40
tree: 029b26e05f844057c9c25576d2a98072bb5b851a
  1. src/
  2. Android.bp
  3. apkzlib.iml
  4. build.gradle
  5. METADATA
  6. OWNERS