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

Change-Id: Ic99172a8c455b8920d237b16b9c2d7e4e83c4105