Merge "Really fix target gtest dependencies"