Merge "libziparchive: fix mac os breakage"