bluetooth: changing Bluedroid -> BlueZ

Change-Id: Ib373b5d0e6aead844713a99a98cedaa689760dfa
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1

Conflicts:
	AndroidManifest.xml
	src/com/android/phone/PhoneGlobals.java

Change-Id: I4fa09ebfcd7aef5265574cea0307d21e64ff6a06