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

* commit '86ae0ff135456b2b695f49cf40ccc4e8ebc60f51':
  Fix pthread_join.