Merge "Fix the usage of GTEST_SKIP"