Fix build with new googletest
am: 409184de0b

Change-Id: Ie11dba3ca9e92db97060921bd126db2d559ee35d