Bug 885630 - include changes for Bluetooth emulation. r=mwu