Merge "Take advantage of updated linux/input.h kernel headers."