Merge "ZipWriter: Do not write DataDescriptor for STORED files" into oc-dev
am: 5f37836f54

Change-Id: I81b4c11f0ba3dcbe6ecf909c050d761fe2c639a9