Merge e66f4ef77da66ee4be68b95bafcc3404ea65d3d6 on remote branch

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