Revert carbon bluedroid