[automerger skipped] Merge "vibrator: use package as name" am: b2067cf8e9 am: e4388a6ff9 am: 6b4a28bde3 -s ours
am skip reason: Change-Id I60b85ed6c69190bcd287403408e31ea6643cee3e with SHA-1 97e818b991 is in history

Change-Id: Ifbb897493059542674d005c17c8978c4443602d3