Merge "Handles spurious wake-ups in pthread_join()"