Fixes Bluetooth after CAF merge

http://review.cyanogenmod.org/#/c/59112/