Merge "Stop hard coding gtest/gmock things." am: 9aef6c7d29 am: 37bbf91a24
am: 632565e26c

Change-Id: I7d33bbc218469ba70ce68cdca5571018a091fd45