CM Merged my bluedroid fix, so may as well track their bluedroid again

Change-Id: I6ad00b8f5f4c935753a333afd41722366deab7b7