Merge "ZipFile: Improve performance for ZipFile.<init>"