Merge "Stop hard coding gtest paths."
am: c6124f7579

* commit 'c6124f7579ddf07c26c37595049edab3da6a4dcd':
  Stop hard coding gtest paths.