Merge "Fix RUNTIME_TARGET_GTEST_MAKE_TARGETS"