Update names to match latest gtest version.
am: c2f85d62c5

Change-Id: I4dc0f07a47762402ee006a5049dbeb91d6a6a324