Merge "Mark libdiskconfig vendor_available." am: 102eb90837 am: 3ac2ae6077
am: 1ba95aea3a

Change-Id: I2025ae60cb17459c37cd8237ade3681c67ca1993