Merge 60bdc4b8fa1256b4764a489c8f62828955e61e89 on remote branch

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