some changes for bluedroid

Change-Id: I3140f6d47fbb14a8ea520dea1432c20fd2b9bbf3
wifi and bluetooth changes

Change-Id: Ib6835a68c550b7634c01a8fd9aae6237cc1e4bc7