Merge "vibrator: use package as name" am: 663e1700be am: 957216f3d5

Change-Id: I5c222505f97ed2795a81e5e6e9b9b2b8ed4b6687