Merge "Make ARM <user.h> more glibc-compatible."