Merge cm's bluetooth into jb42

Change-Id: Ibafa0b29868c68b3b3f4a2c49854ec7911f8c81a