Merge "Mark libdiskconfig vendor_available."
am: 102eb90837

Change-Id: I18ed695d6df0e9848e979ad15eb56fba8923726c