am 024246ec: am 09e89c3c: Merge "Pull the pthread_key_t functions out of pthread.c."

# Via Android Git Automerger (1) and others
* commit '024246ec274e30bb4a24468d8319620534e13b34':
  Pull the pthread_key_t functions out of pthread.c.