Merge "Fix libinput mac build, hopefully."