Merge "Fix x86 user_regs_struct."