Merge "vts: remove deprecated gtest macros"