add bluetooth fixes from androidmeda

Change-Id: I84cabb9b5459cc48fc16216a20001b38798518b4