Merge "zlib is not exposed to libziparchive headers"