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

Change-Id: I38fcd0bda4b1a173a25b15ce3e2f22993ea9770d