Merge "Fixes a system crash in VibratorService on x86 hosts"