Revert "Merge branch 'kk_2.7_rb1.15' of git://codeaurora.org/platform/packages/apps/Bluetooth into cm-11.0"

This reverts commit 2d30e4a060e7d963234ce7a7c06367ea7891d121, reversing
changes made to 83ef3451f58e201a42de2b0b1561138dca922293.