Merge "Fix ZipToolsTest failing on Windows." into studio-master-dev am: 0a096c4d86 am: c3038467a0
am: b98d898b67

Change-Id: I534d65dec0ccc004e5c06704df6c3668eb5e17bc
tree: ab63d0430d28dc404f8564d3228929fdb63fcf6a
  1. src/
  2. apkzlib.iml
  3. BUILD
  4. build.gradle