Merge "Fix the pthread_join on self error case."