Merge "Fix mcontext_t for x86-64."