Revert "Merge branch 'jb_mr2' of git://codeaurora.org/platform/packages/apps/Bluetooth into cm-10.2"

This reverts commit 936863b1ed90b0b310b90544c33ddc391d7ad731, reversing
changes made to 26258e5a38e3e16e25b2cbf9704f22c57db8a71e.