am e04aa450: Merge "Clean up the pthread key tests."

* commit 'e04aa450c2b51ea066d1a1c37978cce808d13872':
  Clean up the pthread key tests.