bluetooth: sync with caf/jb_2.6

Change-Id: I0df0708d57b8fbc7e97b5efa9948676a27054973