Fix build with new googletest
am: ddca605a46

Change-Id: I518dbe60310cc49a9685f174523ed4a5f8a5d0fb