Merge "Fix pthread_t confusion."