Merge "Clean up the pthread key tests."