Merge "Remove vibrator@1.4" am: 716868f7fd
am: eec11626a9

Change-Id: I28e41e8f4c885174858afce283a33aae488f6ae7