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

This reverts commit 248314bb6de9e463d80723bdd72ba904ec2e3af4, reversing
changes made to d18f3ba6eb60f27c1b6c075e0655703e68132b33.