Revert "Merge branch 'jb_mr2' of git://codeaurora.org/platform/external/bluetooth/bluedroid into cm-10.2"

This reverts commit 6b0c4f712e1fd2f3e82b896928d4969da27c505f, reversing
changes made to e386032cade061c9e8381bd2e5248c788d3357de.