Merge "Remove unnecessary padding in ucontext_t"