am 303fe0cb: Merge "Fix pthread_join."

* commit '303fe0cb38def66aa438b9caac32e5af298f840a':
  Fix pthread_join.