Merge "vndk vintf vibrator" am: 2fb810f495 am: 3d00560737
am: 8334b381a5

Change-Id: I3ce03341830436f95242bef4589b2ad26be5b7bf