Add BluetoothExt to cm11

Change-Id: I0cfb9ab368700a416f7275c124f444e02ed0715a
Merge remote-tracking branch 'cm/cm-11.0' into wszf

Conflicts:
	default.xml

Change-Id: Iee65e3b9065b19fa03e0bdb928824f5ff296e995