Merge "Speed up Zip64SizeTest with a larger buffer size"