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

This reverts commit 10925696375f799e324915c2c18e7abc0e4a2cd0, reversing
changes made to ed22a03958b3ebc6a48f29c8be62400f98e7e645.