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

Change-Id: I4831b3d78e9eb7424baf3164ebec3b64f5480599