Merge "Mark libziparchive vendor_available." into oc-dev