Merge "libhardware_legacy: vendor_available" am: 483a68f68a am: 32e427d64d  -s ours
am: 78c1981b8a  -s ours

Change-Id: I90d35976ccd3e6947eddece5eef86bea8a8a9398