Merge "Fix SDK build as BluetoothHDP is removed"