am 7b197ea1: am 5e4a2f31: Merge "Update kernel input headers"

* commit '7b197ea1107055bcdf0a15f285495c5d70a3555c':
  Update kernel input headers