Merge "Mark libziparchive vendor_available."