am 8397cdba: Merge "Revert "Pull the pthread_key_t functions out of pthread.c.""

# Via Gerrit Code Review
* commit '8397cdba9424febeaed4068829a5b0174ee1138c':
  Revert "Pull the pthread_key_t functions out of pthread.c."