Merge "Fix out of bound read in libziparchive" into snap-temp-L87400000056978794