am 2d3e7233: Merge "Revert "Revert "Pull the pthread_key_t functions out of pthread.c."""

# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '2d3e72336e76180fb00822386da4f14203d117ce':
  Revert "Revert "Pull the pthread_key_t functions out of pthread.c.""