Merge "Clean up a little after the gtest 1.7.0 upgrade."