Merge "vibrator: use package as name"