Merge "Fixes a system crash in VibratorService on x86 hosts" am: 5ed0e55859
am: 5d8f3ae57d

Change-Id: Ic699d40f08f65c5b0731dfc75c13f42cd8b3c66a