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

Change-Id: Idcca0f93194e1f8080b101907b8dd54b7b721c1f