Merge "Fix build with new googletest"