Merge "Fix x86_64 register names in <sys/user.h>."