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

Change-Id: Ia58127a6fc31aa67cd384504fde1f4f8b9a9ec95