some changes for bluedroid

Change-Id: I3140f6d47fbb14a8ea520dea1432c20fd2b9bbf3