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

This reverts commit 957dde66f64db44b523715066cc7c4926378c53f, reversing
changes made to 9ae8d2378449f0b69599fecdef740d06d80e96be.