Merge "Switch from uevent model to /dev/input/event." into jb-mr1-dev