Merge "AIDL vibrator required for launching devices."
am: fe720b1bf3

Change-Id: I4b066eae3ec70d5ae3994692fc0fa4c118efcc44