am 22b83da4: Merge "Clean up the sigprocmask/pthread_sigmask implementation."

* commit '22b83da476263bff28fcc6a4696ced58b61d2c1d':
  Clean up the sigprocmask/pthread_sigmask implementation.