Merge "Fix SDK build as BluetoothHDP is removed"
am: e3a587ee82

Change-Id: Ia2c25dd1a2f9a231bdcc8f5847780309906b2fee