am e8336aa8: Merge "Fix keypress vibration duration of HTC One X"

* commit 'e8336aa80cd9964ebd74dcb23d5cba00043563e5':
  Fix keypress vibration duration of HTC One X