Merge "Fix Mac OS build for libziparchive."