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

Change-Id: I1c2fa98c84b699063b75fb04d41d6b36e00f6891