am 7ccd822d: am e6915e0e: Merge "Fix X86 sigsetjmp and siglongjmp"

* commit '7ccd822d1b56bcace157534ff9b5e0551e278908':
  Fix X86 sigsetjmp and siglongjmp