Revert "this is trial and error"

This reverts commit a05df3fd78d6ade3f548a16b66213d8024552550.
settings: add support for bluez stack

This is a combination of 5 commits.

Bluetooth: Add JB tip Bluetooth code to build with bluez based solution

Add JB tip Bluetooth Settings code to build with bluez based solution and
existing Bluetooth Settings code to support bluedroid based solution.
Android.mk file contains the change to toggle between the solution
as needed.

Change-Id: I06244e05419b799bc232e52712a5a171b7f57ee9

Conflicts:

	res/layout/bluetooth_mas_access.xml

Bluetooth: Introduce BluetoothProgressCategory class

Replace ProgressCategory class with BluetoothProgressCategory class
for making use of common settings resources

Change-Id: Icabddba794336232af4211ca32319f37b4a45167

Merge commit 'android-4.2.2_r1' into Upgrade_branch

Change-Id: I3a7b737e7331d11f6d41dce76465af60c5cb841f

Bluetooth: Proper update of the profile list on SDP updates

Updates the profile cache with new UUIDs arrived as part of
SDP results without clearing the existing profiles. This
fixes the IOT issue of few carkits with improper intermediate
UUID updates

Change-Id: I37b2eaf8e873b2798b3b838d15383811b4093c38
CRs-fixed: 450068

Bluetooth: Proper Enable/Disable of Pairing dialogue's OK button

Disable the OK button when there is no suffecient char/keys
entereted on the Pairng dailog's text bx. This would block the
user from trying to pair without having the right PIN key length

CRs-fixed: 455063

Change-Id: Ia9c0d1bfb1f202dadaa82ad9e4de059b90aea044

Conflicts:
	res/values/strings.xml