Merge "Handle binder death with the conductor rather than VibrationThread." into tm-dev