Merge "Fix libinput to build with uapi headers."