Merge "logwrap: Replace sigprocmask with pthread_sigmask"