Merge "Fix x86_64 user_fpregs_struct to use the same name for the tag word as glibc."