Merge "netd_client_test.cpp - switch to GTEST_SKIP in SKIP macro"