Merge "Fix X86 sigsetjmp and siglongjmp"