Merge "[zip] Save 1 malloc and memset for each added file in ZipWriter" am: 3215fd93c7
am: ce1d593087

Change-Id: Icd2c101d04d8d037f840f05b21c01e60f4ec4644