Merge "Don't transitively include <limits.h> from <sys/user.h>."