Merge "Track googletest API change."