Merge "libziparchive: fix extraction of >2GiB images"