am 46d0b81a: Merge "restore sigprocmask in setjmp/longjmp test."

* commit '46d0b81a9465bf74fe44a881365c332dc6173f2f':
  restore sigprocmask in setjmp/longjmp test.