Merge "zip_archive.cc: fix ubsan false positive"