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

Change-Id: Id8b60dff056b3091ac57a367c45e03f62cddbeed