Merge "Don\'t hardcode gtest paths." am: 6b617c7
am: 50db67e

* commit '50db67ef973547d6c2c0c3af39f78760fdf3d0f3':
  Don't hardcode gtest paths.

Change-Id: I422395f16dab27d992b4514e5d8b238e0e4f8675