Merge "Mark libdiskconfig vendor_available." into oc-dev
am: 942e5b2808  -s ours

Change-Id: I850955588e5b5d43cbc71af85ff9fcba9123a677