Merge "Fix build with new googletest"
am: a7e5d5fd5b

Change-Id: Iabaa2f58c1274cf8c8f38c0ef8ab1c9438a5b7fc