Merge "Clean up the sigprocmask/pthread_sigmask implementation."