Merge "zip_archive.cc: fix ubsan false positive" am: adcfbf804f
am: 694e91f676

Change-Id: I02bf6ded246ec64183eaff19893552497df53fbf