am 481b0546: Merge "Fix non-standard pthread mutex interactions."

* commit '481b0546db69274145ee129d19bb03cce4763c6f':
  Fix non-standard pthread mutex interactions.