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

Change-Id: I3f98bfa28daa2e8d303afa6c523ef666709fff61
tree: 5786eaf81caf15e18f9fd95f0e23508ec4ee87c5
  1. src/
  2. apkzlib.iml
  3. BUILD
  4. build.gradle