Merge "ZipWriter: Do not write DataDescriptor for STORED files"