Merge "Avoid using data descriptors in ZIP files when possible."