Merge "Update BluetoothA2dp API"