Fix the BLUETOOTH define that changed.....

Change-Id: I7bd352a02b797bef59b8aee12da1891fb53d0a62
Merge branch 'cm' into HEAD