Merge "Mark libdiskconfig vendor_available."