resotre calibrator, fix mac
More fixes for BT headset, Big Thanks to SlugZero
Merge remote-tracking branch 'quarx/cm11.0-2.6.32' into cm11.0-2.6.32