Merge "Fix build with new googletest"
am: 01a3f13452

Change-Id: Ie3a4476f479edefdb4661f5c2c3c3947fd0e3637