Add BluetoothExt to cm11

Change-Id: I0cfb9ab368700a416f7275c124f444e02ed0715a

Conflicts:

	default.xml
readd VoicePlus

Change-Id: I3a07542ff8d377044058651c0244052f43708141

Conflicts:

	default.xml