Merge "vibrator: fix VTS for effects" am: d13b7577e1
am: 6dd798db7e

Change-Id: Ic9280ad1df39ea381b42b89a2fa95c0c3db80780