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

Change-Id: I6ad532b24ba56d7e55aead79f8d59782339d4388