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

Change-Id: I1a14b7a6eac50d44439a313fa0b86d67689f8a7b