Merge "Add Waveform Support to Vibrator Shell Command"