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

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