Fix building without BLE

The recent upstream merge makes too many unwarranted assumptions
about device capabilities...

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