Merge "vndk vintf vibrator"
am: 2fb810f495

Change-Id: I2fad31f9ec45739270f718cefbf84496821cd01d