Revert "Fix our bt and go back to AOSP"

This reverts commit b0f91c4f5649840f57ae81089d897db207503dc5.
Merge "Revert "Fix our bt and go back to AOSP"" into jb4.3