Merge "Stop manually including gtest headers."