Merge "Add vendor_available to libz"