Merge changes I3de63438,I671517b9 into tm-dev

* changes:
  Don't expose vibrator controllers via VibrationThread.
  Move VibrationStepConductor locking out of VibrationThread.