[automerger skipped] Merge "vibrator: use package as name" am: c8b0187c8b am: e819518de8 am: 950604f8da -s ours
am skip reason: Change-Id I382074d66b06669876d8f9fa4fc95b8a9c4dbf2a with SHA-1 a31e24a799 is in history

Change-Id: I351e21c7557af9bf0bc8080af754f2458b5fd46d