Merge "Avoid using data descriptors in ZIP files when possible."
am: 69055b5a37

Change-Id: I8657c9a4407620c9861d58bcebeaa588508de69b