Merge "vibrator: use package as name" am: b2067cf8e9 am: e4388a6ff9

Change-Id: I6f635d8f3e929e4541c4fe19a5d067b87ee5fb78