Merge "Do a second key cleanup in pthread_exit."