Moved MSVC variadic template fix so that it is applied in all conditions where gtest can be found