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