Use a union to handle aosp renaming of vs_data field in tBTA_BLE_ADV_DATA
thanks to https://github.com/nuclearmistake https://github.com/VanirAOSP
and fix some merge derps
	modified:   bta/include/bta_api.h
	modified:   stack/btm/btm_inq.c
	modified:   stack/l2cap/l2c_ble.c