Bluetooth fixes 

- The last three patches from me needed merge to building correctly for the skate.

Change-Id: I27b8ede3184e8bd28d2fb7aa75b350d230e9ee27
Merge "Bluetooth fixes " into cm-11.0