Merge "Make sys/ioctl_compat.h portable."