Merge "vibrator: use package as name" am: 91a5aa4ea2 am: 8aa0dd830f

Change-Id: I3aa4a55b19914066198c44f28bef0f4232ab8f3d