Update bluetooth configs to work with the recent caf merges

Back to what worked before?

Change-Id: Ibb12c33276afb03c2532d4d5da3eadf329672d3e
Merge branch 'cm-11.0' into martincz