Revert "Rollback Bluetooth changes for now."

This reverts commit abf66847cc824ac09aef80ba3d0059c8fafad865.

Change-Id: Ib3c2317e159c9b3bdba5fdcb02aeaf2683f883b5
Revert "Revert "Rollback Bluetooth changes for now.""

This reverts commit ff927296cef143bd525080caf173c7658e01b7ff.

Change-Id: I57e25afc02f13d7ef567a67b222b217661eacb95
Merge branch 'kitkat' of https://github.com/AOKP/frameworks_base into kitkat