Merge "Use EVIOCSCLOCKID correctly." into jb-dev