Merge "Revert "Pull the pthread_key_t functions out of pthread.c.""