Merge "Make ZipFileTest#testHugeZipFile faster, and reduce ZipFile memory usage."