Use bluetooth configuration from flemmard repo
Merge remote-tracking branch 'upstream/cm-11.0' into carbon-kk

Conflicts:
	BoardConfig.mk