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

Change-Id: Ibfb9262367eac5d528270dfe5ea0bd12edd654ee