Merge "Stop hard coding gtest things."
am: e88f053af9

Change-Id: I08c0178d00681123834d6892424838ce00703146