am 044d4655: am 303fe0cb: Merge "Fix pthread_join."

* commit '044d4655b7c06c9d5988f7dc604e59f76e098f5d':
  Fix pthread_join.