bluedroid: use correct header file.

Change-Id: Ia536e42e24fcc0491a16b160cd5b00189024e0f0
Merge "bluedroid: use correct header file."
Remove bluedroid configuration warning

This warning is fired on every full-eng build.  It seems excessive
given that there are very few other warning fired on a full-eng build
and 0 seems like a reasonable goal to shoot for.

Change-Id: I2fb2b5342dee35b3ed05343466309f6c335022ef
Merge "Remove bluedroid configuration warning"
Merge remote-tracking branch 'aosp/master' into cm-10.1
add BOARD_USE_48K