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

Change-Id: I3dcc58a4f92221089d6c67a860bc08bd40890b00