Merge "Fix up pthread_cond_timedwait."