Merge "Fill in missing bits in x86(_64) ucontext_t"