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

Change-Id: I1ac08aff4613fcc24c8c19707e8d6812ca0f2e9f