Merge "Fix pthread_test to work with gtest 1.7.0."