Merge "Fix build with new googletest"
am: 44bc03af44

Change-Id: Ieab89e84f36f9d54d11e759c49229405d56945ad