am 4d36b0bd: Merge "Fix the pthread_join on self error case."

* commit '4d36b0bd38559ae0376b61a0ac2f5fa8329ec56d':
  Fix the pthread_join on self error case.