Merge "[zip] Save 1 malloc and memset for each added file in ZipWriter"