Merge "Add vendor_available to libexpat"