Merge "ZipWriter: Do not write DataDescriptor for STORED files" am: 47f5581927
am: b087e37d4c

Change-Id: Icb2d0a1e5903e270697e4c0cd701ecc696cfffb1