Revert "some changes for bluedroid"

This reverts commit b291f7cd512e78573ed44137262742a642c108ac.