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

This reverts commit 4e438a0d5e0be9b92915d5380cfa8b2860c35589.

Change-Id: I4c3b0c472bbf8e41715f25c713d3c06530841e90