Merge "Remove wrapper for BluetoothA2dp"