Merge remote-tracking branch 'upstream/master' into base
diff --git a/BUILD b/BUILD
index fd03d52..615031d 100644
--- a/BUILD
+++ b/BUILD
@@ -53,7 +53,7 @@
     "src/core/lib/support/murmur_hash.h",
     "src/core/lib/support/stack_lockfree.h",
     "src/core/lib/support/string.h",
-    "src/core/lib/support/string_win32.h",
+    "src/core/lib/support/string_windows.h",
     "src/core/lib/support/thd_internal.h",
     "src/core/lib/support/time_precise.h",
     "src/core/lib/support/tmpfile.h",
@@ -69,7 +69,7 @@
     "src/core/lib/support/cpu_windows.c",
     "src/core/lib/support/env_linux.c",
     "src/core/lib/support/env_posix.c",
-    "src/core/lib/support/env_win32.c",
+    "src/core/lib/support/env_windows.c",
     "src/core/lib/support/histogram.c",
     "src/core/lib/support/host_port.c",
     "src/core/lib/support/load_file.c",
@@ -77,31 +77,31 @@
     "src/core/lib/support/log_android.c",
     "src/core/lib/support/log_linux.c",
     "src/core/lib/support/log_posix.c",
-    "src/core/lib/support/log_win32.c",
+    "src/core/lib/support/log_windows.c",
     "src/core/lib/support/murmur_hash.c",
     "src/core/lib/support/slice.c",
     "src/core/lib/support/slice_buffer.c",
     "src/core/lib/support/stack_lockfree.c",
     "src/core/lib/support/string.c",
     "src/core/lib/support/string_posix.c",
-    "src/core/lib/support/string_util_win32.c",
-    "src/core/lib/support/string_win32.c",
+    "src/core/lib/support/string_util_windows.c",
+    "src/core/lib/support/string_windows.c",
     "src/core/lib/support/subprocess_posix.c",
     "src/core/lib/support/subprocess_windows.c",
     "src/core/lib/support/sync.c",
     "src/core/lib/support/sync_posix.c",
-    "src/core/lib/support/sync_win32.c",
+    "src/core/lib/support/sync_windows.c",
     "src/core/lib/support/thd.c",
     "src/core/lib/support/thd_posix.c",
-    "src/core/lib/support/thd_win32.c",
+    "src/core/lib/support/thd_windows.c",
     "src/core/lib/support/time.c",
     "src/core/lib/support/time_posix.c",
     "src/core/lib/support/time_precise.c",
-    "src/core/lib/support/time_win32.c",
+    "src/core/lib/support/time_windows.c",
     "src/core/lib/support/tls_pthread.c",
     "src/core/lib/support/tmpfile_msys.c",
     "src/core/lib/support/tmpfile_posix.c",
-    "src/core/lib/support/tmpfile_win32.c",
+    "src/core/lib/support/tmpfile_windows.c",
     "src/core/lib/support/wrap_memcpy.c",
   ],
   hdrs = [
@@ -109,14 +109,14 @@
     "include/grpc/support/atm.h",
     "include/grpc/support/atm_gcc_atomic.h",
     "include/grpc/support/atm_gcc_sync.h",
-    "include/grpc/support/atm_win32.h",
+    "include/grpc/support/atm_windows.h",
     "include/grpc/support/avl.h",
     "include/grpc/support/cmdline.h",
     "include/grpc/support/cpu.h",
     "include/grpc/support/histogram.h",
     "include/grpc/support/host_port.h",
     "include/grpc/support/log.h",
-    "include/grpc/support/log_win32.h",
+    "include/grpc/support/log_windows.h",
     "include/grpc/support/port_platform.h",
     "include/grpc/support/slice.h",
     "include/grpc/support/slice_buffer.h",
@@ -125,7 +125,7 @@
     "include/grpc/support/sync.h",
     "include/grpc/support/sync_generic.h",
     "include/grpc/support/sync_posix.h",
-    "include/grpc/support/sync_win32.h",
+    "include/grpc/support/sync_windows.h",
     "include/grpc/support/thd.h",
     "include/grpc/support/time.h",
     "include/grpc/support/tls.h",
@@ -137,7 +137,7 @@
     "include/grpc/impl/codegen/atm.h",
     "include/grpc/impl/codegen/atm_gcc_atomic.h",
     "include/grpc/impl/codegen/atm_gcc_sync.h",
-    "include/grpc/impl/codegen/atm_win32.h",
+    "include/grpc/impl/codegen/atm_windows.h",
     "include/grpc/impl/codegen/log.h",
     "include/grpc/impl/codegen/port_platform.h",
     "include/grpc/impl/codegen/slice.h",
@@ -145,7 +145,7 @@
     "include/grpc/impl/codegen/sync.h",
     "include/grpc/impl/codegen/sync_generic.h",
     "include/grpc/impl/codegen/sync_posix.h",
-    "include/grpc/impl/codegen/sync_win32.h",
+    "include/grpc/impl/codegen/sync_windows.h",
     "include/grpc/impl/codegen/time.h",
   ],
   includes = [
@@ -194,7 +194,7 @@
     "src/core/lib/iomgr/sockaddr.h",
     "src/core/lib/iomgr/sockaddr_posix.h",
     "src/core/lib/iomgr/sockaddr_utils.h",
-    "src/core/lib/iomgr/sockaddr_win32.h",
+    "src/core/lib/iomgr/sockaddr_windows.h",
     "src/core/lib/iomgr/socket_utils_posix.h",
     "src/core/lib/iomgr/socket_windows.h",
     "src/core/lib/iomgr/tcp_client.h",
@@ -415,7 +415,7 @@
     "src/core/lib/security/credentials/credentials_metadata.c",
     "src/core/lib/security/credentials/fake/fake_credentials.c",
     "src/core/lib/security/credentials/google_default/credentials_posix.c",
-    "src/core/lib/security/credentials/google_default/credentials_win32.c",
+    "src/core/lib/security/credentials/google_default/credentials_windows.c",
     "src/core/lib/security/credentials/google_default/google_default_credentials.c",
     "src/core/lib/security/credentials/iam/iam_credentials.c",
     "src/core/lib/security/credentials/jwt/json_token.c",
@@ -494,7 +494,7 @@
     "include/grpc/impl/codegen/atm.h",
     "include/grpc/impl/codegen/atm_gcc_atomic.h",
     "include/grpc/impl/codegen/atm_gcc_sync.h",
-    "include/grpc/impl/codegen/atm_win32.h",
+    "include/grpc/impl/codegen/atm_windows.h",
     "include/grpc/impl/codegen/log.h",
     "include/grpc/impl/codegen/port_platform.h",
     "include/grpc/impl/codegen/slice.h",
@@ -502,7 +502,7 @@
     "include/grpc/impl/codegen/sync.h",
     "include/grpc/impl/codegen/sync_generic.h",
     "include/grpc/impl/codegen/sync_posix.h",
-    "include/grpc/impl/codegen/sync_win32.h",
+    "include/grpc/impl/codegen/sync_windows.h",
     "include/grpc/impl/codegen/time.h",
     "include/grpc/grpc_cronet.h",
     "include/grpc/grpc_security.h",
@@ -562,7 +562,7 @@
     "src/core/lib/iomgr/sockaddr.h",
     "src/core/lib/iomgr/sockaddr_posix.h",
     "src/core/lib/iomgr/sockaddr_utils.h",
-    "src/core/lib/iomgr/sockaddr_win32.h",
+    "src/core/lib/iomgr/sockaddr_windows.h",
     "src/core/lib/iomgr/socket_utils_posix.h",
     "src/core/lib/iomgr/socket_windows.h",
     "src/core/lib/iomgr/tcp_client.h",
@@ -807,7 +807,7 @@
     "include/grpc/impl/codegen/atm.h",
     "include/grpc/impl/codegen/atm_gcc_atomic.h",
     "include/grpc/impl/codegen/atm_gcc_sync.h",
-    "include/grpc/impl/codegen/atm_win32.h",
+    "include/grpc/impl/codegen/atm_windows.h",
     "include/grpc/impl/codegen/log.h",
     "include/grpc/impl/codegen/port_platform.h",
     "include/grpc/impl/codegen/slice.h",
@@ -815,7 +815,7 @@
     "include/grpc/impl/codegen/sync.h",
     "include/grpc/impl/codegen/sync_generic.h",
     "include/grpc/impl/codegen/sync_posix.h",
-    "include/grpc/impl/codegen/sync_win32.h",
+    "include/grpc/impl/codegen/sync_windows.h",
     "include/grpc/impl/codegen/time.h",
     "include/grpc/census.h",
   ],
@@ -982,7 +982,7 @@
     "include/grpc/impl/codegen/atm.h",
     "include/grpc/impl/codegen/atm_gcc_atomic.h",
     "include/grpc/impl/codegen/atm_gcc_sync.h",
-    "include/grpc/impl/codegen/atm_win32.h",
+    "include/grpc/impl/codegen/atm_windows.h",
     "include/grpc/impl/codegen/log.h",
     "include/grpc/impl/codegen/port_platform.h",
     "include/grpc/impl/codegen/slice.h",
@@ -990,7 +990,7 @@
     "include/grpc/impl/codegen/sync.h",
     "include/grpc/impl/codegen/sync_generic.h",
     "include/grpc/impl/codegen/sync_posix.h",
-    "include/grpc/impl/codegen/sync_win32.h",
+    "include/grpc/impl/codegen/sync_windows.h",
     "include/grpc/impl/codegen/time.h",
     "include/grpc++/impl/codegen/config.h",
     "include/grpc++/impl/codegen/config_protobuf.h",
@@ -1130,7 +1130,7 @@
     "include/grpc/impl/codegen/atm.h",
     "include/grpc/impl/codegen/atm_gcc_atomic.h",
     "include/grpc/impl/codegen/atm_gcc_sync.h",
-    "include/grpc/impl/codegen/atm_win32.h",
+    "include/grpc/impl/codegen/atm_windows.h",
     "include/grpc/impl/codegen/log.h",
     "include/grpc/impl/codegen/port_platform.h",
     "include/grpc/impl/codegen/slice.h",
@@ -1138,7 +1138,7 @@
     "include/grpc/impl/codegen/sync.h",
     "include/grpc/impl/codegen/sync_generic.h",
     "include/grpc/impl/codegen/sync_posix.h",
-    "include/grpc/impl/codegen/sync_win32.h",
+    "include/grpc/impl/codegen/sync_windows.h",
     "include/grpc/impl/codegen/time.h",
     "include/grpc++/impl/codegen/config.h",
     "include/grpc++/impl/codegen/config_protobuf.h",
@@ -1236,7 +1236,7 @@
     "src/core/lib/support/cpu_windows.c",
     "src/core/lib/support/env_linux.c",
     "src/core/lib/support/env_posix.c",
-    "src/core/lib/support/env_win32.c",
+    "src/core/lib/support/env_windows.c",
     "src/core/lib/support/histogram.c",
     "src/core/lib/support/host_port.c",
     "src/core/lib/support/load_file.c",
@@ -1244,31 +1244,31 @@
     "src/core/lib/support/log_android.c",
     "src/core/lib/support/log_linux.c",
     "src/core/lib/support/log_posix.c",
-    "src/core/lib/support/log_win32.c",
+    "src/core/lib/support/log_windows.c",
     "src/core/lib/support/murmur_hash.c",
     "src/core/lib/support/slice.c",
     "src/core/lib/support/slice_buffer.c",
     "src/core/lib/support/stack_lockfree.c",
     "src/core/lib/support/string.c",
     "src/core/lib/support/string_posix.c",
-    "src/core/lib/support/string_util_win32.c",
-    "src/core/lib/support/string_win32.c",
+    "src/core/lib/support/string_util_windows.c",
+    "src/core/lib/support/string_windows.c",
     "src/core/lib/support/subprocess_posix.c",
     "src/core/lib/support/subprocess_windows.c",
     "src/core/lib/support/sync.c",
     "src/core/lib/support/sync_posix.c",
-    "src/core/lib/support/sync_win32.c",
+    "src/core/lib/support/sync_windows.c",
     "src/core/lib/support/thd.c",
     "src/core/lib/support/thd_posix.c",
-    "src/core/lib/support/thd_win32.c",
+    "src/core/lib/support/thd_windows.c",
     "src/core/lib/support/time.c",
     "src/core/lib/support/time_posix.c",
     "src/core/lib/support/time_precise.c",
-    "src/core/lib/support/time_win32.c",
+    "src/core/lib/support/time_windows.c",
     "src/core/lib/support/tls_pthread.c",
     "src/core/lib/support/tmpfile_msys.c",
     "src/core/lib/support/tmpfile_posix.c",
-    "src/core/lib/support/tmpfile_win32.c",
+    "src/core/lib/support/tmpfile_windows.c",
     "src/core/lib/support/wrap_memcpy.c",
   ],
   hdrs = [
@@ -1276,14 +1276,14 @@
     "include/grpc/support/atm.h",
     "include/grpc/support/atm_gcc_atomic.h",
     "include/grpc/support/atm_gcc_sync.h",
-    "include/grpc/support/atm_win32.h",
+    "include/grpc/support/atm_windows.h",
     "include/grpc/support/avl.h",
     "include/grpc/support/cmdline.h",
     "include/grpc/support/cpu.h",
     "include/grpc/support/histogram.h",
     "include/grpc/support/host_port.h",
     "include/grpc/support/log.h",
-    "include/grpc/support/log_win32.h",
+    "include/grpc/support/log_windows.h",
     "include/grpc/support/port_platform.h",
     "include/grpc/support/slice.h",
     "include/grpc/support/slice_buffer.h",
@@ -1292,7 +1292,7 @@
     "include/grpc/support/sync.h",
     "include/grpc/support/sync_generic.h",
     "include/grpc/support/sync_posix.h",
-    "include/grpc/support/sync_win32.h",
+    "include/grpc/support/sync_windows.h",
     "include/grpc/support/thd.h",
     "include/grpc/support/time.h",
     "include/grpc/support/tls.h",
@@ -1304,7 +1304,7 @@
     "include/grpc/impl/codegen/atm.h",
     "include/grpc/impl/codegen/atm_gcc_atomic.h",
     "include/grpc/impl/codegen/atm_gcc_sync.h",
-    "include/grpc/impl/codegen/atm_win32.h",
+    "include/grpc/impl/codegen/atm_windows.h",
     "include/grpc/impl/codegen/log.h",
     "include/grpc/impl/codegen/port_platform.h",
     "include/grpc/impl/codegen/slice.h",
@@ -1312,7 +1312,7 @@
     "include/grpc/impl/codegen/sync.h",
     "include/grpc/impl/codegen/sync_generic.h",
     "include/grpc/impl/codegen/sync_posix.h",
-    "include/grpc/impl/codegen/sync_win32.h",
+    "include/grpc/impl/codegen/sync_windows.h",
     "include/grpc/impl/codegen/time.h",
     "src/core/lib/profiling/timers.h",
     "src/core/lib/support/backoff.h",
@@ -1322,7 +1322,7 @@
     "src/core/lib/support/murmur_hash.h",
     "src/core/lib/support/stack_lockfree.h",
     "src/core/lib/support/string.h",
-    "src/core/lib/support/string_win32.h",
+    "src/core/lib/support/string_windows.h",
     "src/core/lib/support/thd_internal.h",
     "src/core/lib/support/time_precise.h",
     "src/core/lib/support/tmpfile.h",
@@ -1452,7 +1452,7 @@
     "src/core/lib/security/credentials/credentials_metadata.c",
     "src/core/lib/security/credentials/fake/fake_credentials.c",
     "src/core/lib/security/credentials/google_default/credentials_posix.c",
-    "src/core/lib/security/credentials/google_default/credentials_win32.c",
+    "src/core/lib/security/credentials/google_default/credentials_windows.c",
     "src/core/lib/security/credentials/google_default/google_default_credentials.c",
     "src/core/lib/security/credentials/iam/iam_credentials.c",
     "src/core/lib/security/credentials/jwt/json_token.c",
@@ -1531,7 +1531,7 @@
     "include/grpc/impl/codegen/atm.h",
     "include/grpc/impl/codegen/atm_gcc_atomic.h",
     "include/grpc/impl/codegen/atm_gcc_sync.h",
-    "include/grpc/impl/codegen/atm_win32.h",
+    "include/grpc/impl/codegen/atm_windows.h",
     "include/grpc/impl/codegen/log.h",
     "include/grpc/impl/codegen/port_platform.h",
     "include/grpc/impl/codegen/slice.h",
@@ -1539,7 +1539,7 @@
     "include/grpc/impl/codegen/sync.h",
     "include/grpc/impl/codegen/sync_generic.h",
     "include/grpc/impl/codegen/sync_posix.h",
-    "include/grpc/impl/codegen/sync_win32.h",
+    "include/grpc/impl/codegen/sync_windows.h",
     "include/grpc/impl/codegen/time.h",
     "include/grpc/grpc_cronet.h",
     "include/grpc/grpc_security.h",
@@ -1578,7 +1578,7 @@
     "src/core/lib/iomgr/sockaddr.h",
     "src/core/lib/iomgr/sockaddr_posix.h",
     "src/core/lib/iomgr/sockaddr_utils.h",
-    "src/core/lib/iomgr/sockaddr_win32.h",
+    "src/core/lib/iomgr/sockaddr_windows.h",
     "src/core/lib/iomgr/socket_utils_posix.h",
     "src/core/lib/iomgr/socket_windows.h",
     "src/core/lib/iomgr/tcp_client.h",
diff --git a/Makefile b/Makefile
index 817fcd0..971377f 100644
--- a/Makefile
+++ b/Makefile
@@ -2326,7 +2326,7 @@
     src/core/lib/support/cpu_windows.c \
     src/core/lib/support/env_linux.c \
     src/core/lib/support/env_posix.c \
-    src/core/lib/support/env_win32.c \
+    src/core/lib/support/env_windows.c \
     src/core/lib/support/histogram.c \
     src/core/lib/support/host_port.c \
     src/core/lib/support/load_file.c \
@@ -2334,31 +2334,31 @@
     src/core/lib/support/log_android.c \
     src/core/lib/support/log_linux.c \
     src/core/lib/support/log_posix.c \
-    src/core/lib/support/log_win32.c \
+    src/core/lib/support/log_windows.c \
     src/core/lib/support/murmur_hash.c \
     src/core/lib/support/slice.c \
     src/core/lib/support/slice_buffer.c \
     src/core/lib/support/stack_lockfree.c \
     src/core/lib/support/string.c \
     src/core/lib/support/string_posix.c \
-    src/core/lib/support/string_util_win32.c \
-    src/core/lib/support/string_win32.c \
+    src/core/lib/support/string_util_windows.c \
+    src/core/lib/support/string_windows.c \
     src/core/lib/support/subprocess_posix.c \
     src/core/lib/support/subprocess_windows.c \
     src/core/lib/support/sync.c \
     src/core/lib/support/sync_posix.c \
-    src/core/lib/support/sync_win32.c \
+    src/core/lib/support/sync_windows.c \
     src/core/lib/support/thd.c \
     src/core/lib/support/thd_posix.c \
-    src/core/lib/support/thd_win32.c \
+    src/core/lib/support/thd_windows.c \
     src/core/lib/support/time.c \
     src/core/lib/support/time_posix.c \
     src/core/lib/support/time_precise.c \
-    src/core/lib/support/time_win32.c \
+    src/core/lib/support/time_windows.c \
     src/core/lib/support/tls_pthread.c \
     src/core/lib/support/tmpfile_msys.c \
     src/core/lib/support/tmpfile_posix.c \
-    src/core/lib/support/tmpfile_win32.c \
+    src/core/lib/support/tmpfile_windows.c \
     src/core/lib/support/wrap_memcpy.c \
 
 PUBLIC_HEADERS_C += \
@@ -2366,14 +2366,14 @@
     include/grpc/support/atm.h \
     include/grpc/support/atm_gcc_atomic.h \
     include/grpc/support/atm_gcc_sync.h \
-    include/grpc/support/atm_win32.h \
+    include/grpc/support/atm_windows.h \
     include/grpc/support/avl.h \
     include/grpc/support/cmdline.h \
     include/grpc/support/cpu.h \
     include/grpc/support/histogram.h \
     include/grpc/support/host_port.h \
     include/grpc/support/log.h \
-    include/grpc/support/log_win32.h \
+    include/grpc/support/log_windows.h \
     include/grpc/support/port_platform.h \
     include/grpc/support/slice.h \
     include/grpc/support/slice_buffer.h \
@@ -2382,7 +2382,7 @@
     include/grpc/support/sync.h \
     include/grpc/support/sync_generic.h \
     include/grpc/support/sync_posix.h \
-    include/grpc/support/sync_win32.h \
+    include/grpc/support/sync_windows.h \
     include/grpc/support/thd.h \
     include/grpc/support/time.h \
     include/grpc/support/tls.h \
@@ -2394,7 +2394,7 @@
     include/grpc/impl/codegen/atm.h \
     include/grpc/impl/codegen/atm_gcc_atomic.h \
     include/grpc/impl/codegen/atm_gcc_sync.h \
-    include/grpc/impl/codegen/atm_win32.h \
+    include/grpc/impl/codegen/atm_windows.h \
     include/grpc/impl/codegen/log.h \
     include/grpc/impl/codegen/port_platform.h \
     include/grpc/impl/codegen/slice.h \
@@ -2402,7 +2402,7 @@
     include/grpc/impl/codegen/sync.h \
     include/grpc/impl/codegen/sync_generic.h \
     include/grpc/impl/codegen/sync_posix.h \
-    include/grpc/impl/codegen/sync_win32.h \
+    include/grpc/impl/codegen/sync_windows.h \
     include/grpc/impl/codegen/time.h \
 
 LIBGPR_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGPR_SRC))))
@@ -2580,7 +2580,7 @@
     src/core/lib/security/credentials/credentials_metadata.c \
     src/core/lib/security/credentials/fake/fake_credentials.c \
     src/core/lib/security/credentials/google_default/credentials_posix.c \
-    src/core/lib/security/credentials/google_default/credentials_win32.c \
+    src/core/lib/security/credentials/google_default/credentials_windows.c \
     src/core/lib/security/credentials/google_default/google_default_credentials.c \
     src/core/lib/security/credentials/iam/iam_credentials.c \
     src/core/lib/security/credentials/jwt/json_token.c \
@@ -2662,7 +2662,7 @@
     include/grpc/impl/codegen/atm.h \
     include/grpc/impl/codegen/atm_gcc_atomic.h \
     include/grpc/impl/codegen/atm_gcc_sync.h \
-    include/grpc/impl/codegen/atm_win32.h \
+    include/grpc/impl/codegen/atm_windows.h \
     include/grpc/impl/codegen/log.h \
     include/grpc/impl/codegen/port_platform.h \
     include/grpc/impl/codegen/slice.h \
@@ -2670,7 +2670,7 @@
     include/grpc/impl/codegen/sync.h \
     include/grpc/impl/codegen/sync_generic.h \
     include/grpc/impl/codegen/sync_posix.h \
-    include/grpc/impl/codegen/sync_win32.h \
+    include/grpc/impl/codegen/sync_windows.h \
     include/grpc/impl/codegen/time.h \
     include/grpc/grpc_cronet.h \
     include/grpc/grpc_security.h \
@@ -2984,7 +2984,7 @@
     include/grpc/impl/codegen/atm.h \
     include/grpc/impl/codegen/atm_gcc_atomic.h \
     include/grpc/impl/codegen/atm_gcc_sync.h \
-    include/grpc/impl/codegen/atm_win32.h \
+    include/grpc/impl/codegen/atm_windows.h \
     include/grpc/impl/codegen/log.h \
     include/grpc/impl/codegen/port_platform.h \
     include/grpc/impl/codegen/slice.h \
@@ -2992,7 +2992,7 @@
     include/grpc/impl/codegen/sync.h \
     include/grpc/impl/codegen/sync_generic.h \
     include/grpc/impl/codegen/sync_posix.h \
-    include/grpc/impl/codegen/sync_win32.h \
+    include/grpc/impl/codegen/sync_windows.h \
     include/grpc/impl/codegen/time.h \
     include/grpc/census.h \
 
@@ -3273,7 +3273,7 @@
     include/grpc/impl/codegen/atm.h \
     include/grpc/impl/codegen/atm_gcc_atomic.h \
     include/grpc/impl/codegen/atm_gcc_sync.h \
-    include/grpc/impl/codegen/atm_win32.h \
+    include/grpc/impl/codegen/atm_windows.h \
     include/grpc/impl/codegen/log.h \
     include/grpc/impl/codegen/port_platform.h \
     include/grpc/impl/codegen/slice.h \
@@ -3281,7 +3281,7 @@
     include/grpc/impl/codegen/sync.h \
     include/grpc/impl/codegen/sync_generic.h \
     include/grpc/impl/codegen/sync_posix.h \
-    include/grpc/impl/codegen/sync_win32.h \
+    include/grpc/impl/codegen/sync_windows.h \
     include/grpc/impl/codegen/time.h \
     include/grpc++/impl/codegen/config.h \
     include/grpc++/impl/codegen/config_protobuf.h \
@@ -3579,7 +3579,7 @@
     include/grpc/impl/codegen/atm.h \
     include/grpc/impl/codegen/atm_gcc_atomic.h \
     include/grpc/impl/codegen/atm_gcc_sync.h \
-    include/grpc/impl/codegen/atm_win32.h \
+    include/grpc/impl/codegen/atm_windows.h \
     include/grpc/impl/codegen/log.h \
     include/grpc/impl/codegen/port_platform.h \
     include/grpc/impl/codegen/slice.h \
@@ -3587,7 +3587,7 @@
     include/grpc/impl/codegen/sync.h \
     include/grpc/impl/codegen/sync_generic.h \
     include/grpc/impl/codegen/sync_posix.h \
-    include/grpc/impl/codegen/sync_win32.h \
+    include/grpc/impl/codegen/sync_windows.h \
     include/grpc/impl/codegen/time.h \
     include/grpc++/impl/codegen/config.h \
     include/grpc++/impl/codegen/config_protobuf.h \
@@ -14139,7 +14139,7 @@
 src/core/lib/security/credentials/credentials_metadata.c: $(OPENSSL_DEP)
 src/core/lib/security/credentials/fake/fake_credentials.c: $(OPENSSL_DEP)
 src/core/lib/security/credentials/google_default/credentials_posix.c: $(OPENSSL_DEP)
-src/core/lib/security/credentials/google_default/credentials_win32.c: $(OPENSSL_DEP)
+src/core/lib/security/credentials/google_default/credentials_windows.c: $(OPENSSL_DEP)
 src/core/lib/security/credentials/google_default/google_default_credentials.c: $(OPENSSL_DEP)
 src/core/lib/security/credentials/iam/iam_credentials.c: $(OPENSSL_DEP)
 src/core/lib/security/credentials/jwt/json_token.c: $(OPENSSL_DEP)
diff --git a/binding.gyp b/binding.gyp
index 7b18707..0cc0281 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -507,7 +507,7 @@
         'src/core/lib/support/cpu_windows.c',
         'src/core/lib/support/env_linux.c',
         'src/core/lib/support/env_posix.c',
-        'src/core/lib/support/env_win32.c',
+        'src/core/lib/support/env_windows.c',
         'src/core/lib/support/histogram.c',
         'src/core/lib/support/host_port.c',
         'src/core/lib/support/load_file.c',
@@ -515,31 +515,31 @@
         'src/core/lib/support/log_android.c',
         'src/core/lib/support/log_linux.c',
         'src/core/lib/support/log_posix.c',
-        'src/core/lib/support/log_win32.c',
+        'src/core/lib/support/log_windows.c',
         'src/core/lib/support/murmur_hash.c',
         'src/core/lib/support/slice.c',
         'src/core/lib/support/slice_buffer.c',
         'src/core/lib/support/stack_lockfree.c',
         'src/core/lib/support/string.c',
         'src/core/lib/support/string_posix.c',
-        'src/core/lib/support/string_util_win32.c',
-        'src/core/lib/support/string_win32.c',
+        'src/core/lib/support/string_util_windows.c',
+        'src/core/lib/support/string_windows.c',
         'src/core/lib/support/subprocess_posix.c',
         'src/core/lib/support/subprocess_windows.c',
         'src/core/lib/support/sync.c',
         'src/core/lib/support/sync_posix.c',
-        'src/core/lib/support/sync_win32.c',
+        'src/core/lib/support/sync_windows.c',
         'src/core/lib/support/thd.c',
         'src/core/lib/support/thd_posix.c',
-        'src/core/lib/support/thd_win32.c',
+        'src/core/lib/support/thd_windows.c',
         'src/core/lib/support/time.c',
         'src/core/lib/support/time_posix.c',
         'src/core/lib/support/time_precise.c',
-        'src/core/lib/support/time_win32.c',
+        'src/core/lib/support/time_windows.c',
         'src/core/lib/support/tls_pthread.c',
         'src/core/lib/support/tmpfile_msys.c',
         'src/core/lib/support/tmpfile_posix.c',
-        'src/core/lib/support/tmpfile_win32.c',
+        'src/core/lib/support/tmpfile_windows.c',
         'src/core/lib/support/wrap_memcpy.c',
       ],
       "conditions": [
@@ -675,7 +675,7 @@
         'src/core/lib/security/credentials/credentials_metadata.c',
         'src/core/lib/security/credentials/fake/fake_credentials.c',
         'src/core/lib/security/credentials/google_default/credentials_posix.c',
-        'src/core/lib/security/credentials/google_default/credentials_win32.c',
+        'src/core/lib/security/credentials/google_default/credentials_windows.c',
         'src/core/lib/security/credentials/google_default/google_default_credentials.c',
         'src/core/lib/security/credentials/iam/iam_credentials.c',
         'src/core/lib/security/credentials/jwt/json_token.c',
diff --git a/build.yaml b/build.yaml
index 429dbb3..5fcd9c3 100644
--- a/build.yaml
+++ b/build.yaml
@@ -38,14 +38,14 @@
   - include/grpc/support/atm.h
   - include/grpc/support/atm_gcc_atomic.h
   - include/grpc/support/atm_gcc_sync.h
-  - include/grpc/support/atm_win32.h
+  - include/grpc/support/atm_windows.h
   - include/grpc/support/avl.h
   - include/grpc/support/cmdline.h
   - include/grpc/support/cpu.h
   - include/grpc/support/histogram.h
   - include/grpc/support/host_port.h
   - include/grpc/support/log.h
-  - include/grpc/support/log_win32.h
+  - include/grpc/support/log_windows.h
   - include/grpc/support/port_platform.h
   - include/grpc/support/slice.h
   - include/grpc/support/slice_buffer.h
@@ -54,7 +54,7 @@
   - include/grpc/support/sync.h
   - include/grpc/support/sync_generic.h
   - include/grpc/support/sync_posix.h
-  - include/grpc/support/sync_win32.h
+  - include/grpc/support/sync_windows.h
   - include/grpc/support/thd.h
   - include/grpc/support/time.h
   - include/grpc/support/tls.h
@@ -71,7 +71,7 @@
   - src/core/lib/support/murmur_hash.h
   - src/core/lib/support/stack_lockfree.h
   - src/core/lib/support/string.h
-  - src/core/lib/support/string_win32.h
+  - src/core/lib/support/string_windows.h
   - src/core/lib/support/thd_internal.h
   - src/core/lib/support/time_precise.h
   - src/core/lib/support/tmpfile.h
@@ -88,7 +88,7 @@
   - src/core/lib/support/cpu_windows.c
   - src/core/lib/support/env_linux.c
   - src/core/lib/support/env_posix.c
-  - src/core/lib/support/env_win32.c
+  - src/core/lib/support/env_windows.c
   - src/core/lib/support/histogram.c
   - src/core/lib/support/host_port.c
   - src/core/lib/support/load_file.c
@@ -96,31 +96,31 @@
   - src/core/lib/support/log_android.c
   - src/core/lib/support/log_linux.c
   - src/core/lib/support/log_posix.c
-  - src/core/lib/support/log_win32.c
+  - src/core/lib/support/log_windows.c
   - src/core/lib/support/murmur_hash.c
   - src/core/lib/support/slice.c
   - src/core/lib/support/slice_buffer.c
   - src/core/lib/support/stack_lockfree.c
   - src/core/lib/support/string.c
   - src/core/lib/support/string_posix.c
-  - src/core/lib/support/string_util_win32.c
-  - src/core/lib/support/string_win32.c
+  - src/core/lib/support/string_util_windows.c
+  - src/core/lib/support/string_windows.c
   - src/core/lib/support/subprocess_posix.c
   - src/core/lib/support/subprocess_windows.c
   - src/core/lib/support/sync.c
   - src/core/lib/support/sync_posix.c
-  - src/core/lib/support/sync_win32.c
+  - src/core/lib/support/sync_windows.c
   - src/core/lib/support/thd.c
   - src/core/lib/support/thd_posix.c
-  - src/core/lib/support/thd_win32.c
+  - src/core/lib/support/thd_windows.c
   - src/core/lib/support/time.c
   - src/core/lib/support/time_posix.c
   - src/core/lib/support/time_precise.c
-  - src/core/lib/support/time_win32.c
+  - src/core/lib/support/time_windows.c
   - src/core/lib/support/tls_pthread.c
   - src/core/lib/support/tmpfile_msys.c
   - src/core/lib/support/tmpfile_posix.c
-  - src/core/lib/support/tmpfile_win32.c
+  - src/core/lib/support/tmpfile_windows.c
   - src/core/lib/support/wrap_memcpy.c
   uses:
   - gpr_codegen
@@ -130,7 +130,7 @@
   - include/grpc/impl/codegen/atm.h
   - include/grpc/impl/codegen/atm_gcc_atomic.h
   - include/grpc/impl/codegen/atm_gcc_sync.h
-  - include/grpc/impl/codegen/atm_win32.h
+  - include/grpc/impl/codegen/atm_windows.h
   - include/grpc/impl/codegen/log.h
   - include/grpc/impl/codegen/port_platform.h
   - include/grpc/impl/codegen/slice.h
@@ -138,7 +138,7 @@
   - include/grpc/impl/codegen/sync.h
   - include/grpc/impl/codegen/sync_generic.h
   - include/grpc/impl/codegen/sync_posix.h
-  - include/grpc/impl/codegen/sync_win32.h
+  - include/grpc/impl/codegen/sync_windows.h
   - include/grpc/impl/codegen/time.h
 - name: grpc_base
   public_headers:
@@ -181,7 +181,7 @@
   - src/core/lib/iomgr/sockaddr.h
   - src/core/lib/iomgr/sockaddr_posix.h
   - src/core/lib/iomgr/sockaddr_utils.h
-  - src/core/lib/iomgr/sockaddr_win32.h
+  - src/core/lib/iomgr/sockaddr_windows.h
   - src/core/lib/iomgr/socket_utils_posix.h
   - src/core/lib/iomgr/socket_windows.h
   - src/core/lib/iomgr/tcp_client.h
@@ -430,7 +430,7 @@
   - src/core/lib/security/credentials/credentials_metadata.c
   - src/core/lib/security/credentials/fake/fake_credentials.c
   - src/core/lib/security/credentials/google_default/credentials_posix.c
-  - src/core/lib/security/credentials/google_default/credentials_win32.c
+  - src/core/lib/security/credentials/google_default/credentials_windows.c
   - src/core/lib/security/credentials/google_default/google_default_credentials.c
   - src/core/lib/security/credentials/iam/iam_credentials.c
   - src/core/lib/security/credentials/jwt/json_token.c
diff --git a/config.m4 b/config.m4
index 29df77c..5b5b84e 100644
--- a/config.m4
+++ b/config.m4
@@ -48,7 +48,7 @@
     src/core/lib/support/cpu_windows.c \
     src/core/lib/support/env_linux.c \
     src/core/lib/support/env_posix.c \
-    src/core/lib/support/env_win32.c \
+    src/core/lib/support/env_windows.c \
     src/core/lib/support/histogram.c \
     src/core/lib/support/host_port.c \
     src/core/lib/support/load_file.c \
@@ -56,31 +56,31 @@
     src/core/lib/support/log_android.c \
     src/core/lib/support/log_linux.c \
     src/core/lib/support/log_posix.c \
-    src/core/lib/support/log_win32.c \
+    src/core/lib/support/log_windows.c \
     src/core/lib/support/murmur_hash.c \
     src/core/lib/support/slice.c \
     src/core/lib/support/slice_buffer.c \
     src/core/lib/support/stack_lockfree.c \
     src/core/lib/support/string.c \
     src/core/lib/support/string_posix.c \
-    src/core/lib/support/string_util_win32.c \
-    src/core/lib/support/string_win32.c \
+    src/core/lib/support/string_util_windows.c \
+    src/core/lib/support/string_windows.c \
     src/core/lib/support/subprocess_posix.c \
     src/core/lib/support/subprocess_windows.c \
     src/core/lib/support/sync.c \
     src/core/lib/support/sync_posix.c \
-    src/core/lib/support/sync_win32.c \
+    src/core/lib/support/sync_windows.c \
     src/core/lib/support/thd.c \
     src/core/lib/support/thd_posix.c \
-    src/core/lib/support/thd_win32.c \
+    src/core/lib/support/thd_windows.c \
     src/core/lib/support/time.c \
     src/core/lib/support/time_posix.c \
     src/core/lib/support/time_precise.c \
-    src/core/lib/support/time_win32.c \
+    src/core/lib/support/time_windows.c \
     src/core/lib/support/tls_pthread.c \
     src/core/lib/support/tmpfile_msys.c \
     src/core/lib/support/tmpfile_posix.c \
-    src/core/lib/support/tmpfile_win32.c \
+    src/core/lib/support/tmpfile_windows.c \
     src/core/lib/support/wrap_memcpy.c \
     src/core/lib/surface/init.c \
     src/core/lib/channel/channel_args.c \
@@ -194,7 +194,7 @@
     src/core/lib/security/credentials/credentials_metadata.c \
     src/core/lib/security/credentials/fake/fake_credentials.c \
     src/core/lib/security/credentials/google_default/credentials_posix.c \
-    src/core/lib/security/credentials/google_default/credentials_win32.c \
+    src/core/lib/security/credentials/google_default/credentials_windows.c \
     src/core/lib/security/credentials/google_default/google_default_credentials.c \
     src/core/lib/security/credentials/iam/iam_credentials.c \
     src/core/lib/security/credentials/jwt/json_token.c \
diff --git a/gRPC.podspec b/gRPC.podspec
index cc8ba3d..5ba8347 100644
--- a/gRPC.podspec
+++ b/gRPC.podspec
@@ -72,7 +72,7 @@
                       'src/core/lib/support/murmur_hash.h',
                       'src/core/lib/support/stack_lockfree.h',
                       'src/core/lib/support/string.h',
-                      'src/core/lib/support/string_win32.h',
+                      'src/core/lib/support/string_windows.h',
                       'src/core/lib/support/thd_internal.h',
                       'src/core/lib/support/time_precise.h',
                       'src/core/lib/support/tmpfile.h',
@@ -80,14 +80,14 @@
                       'include/grpc/support/atm.h',
                       'include/grpc/support/atm_gcc_atomic.h',
                       'include/grpc/support/atm_gcc_sync.h',
-                      'include/grpc/support/atm_win32.h',
+                      'include/grpc/support/atm_windows.h',
                       'include/grpc/support/avl.h',
                       'include/grpc/support/cmdline.h',
                       'include/grpc/support/cpu.h',
                       'include/grpc/support/histogram.h',
                       'include/grpc/support/host_port.h',
                       'include/grpc/support/log.h',
-                      'include/grpc/support/log_win32.h',
+                      'include/grpc/support/log_windows.h',
                       'include/grpc/support/port_platform.h',
                       'include/grpc/support/slice.h',
                       'include/grpc/support/slice_buffer.h',
@@ -96,7 +96,7 @@
                       'include/grpc/support/sync.h',
                       'include/grpc/support/sync_generic.h',
                       'include/grpc/support/sync_posix.h',
-                      'include/grpc/support/sync_win32.h',
+                      'include/grpc/support/sync_windows.h',
                       'include/grpc/support/thd.h',
                       'include/grpc/support/time.h',
                       'include/grpc/support/tls.h',
@@ -108,7 +108,7 @@
                       'include/grpc/impl/codegen/atm.h',
                       'include/grpc/impl/codegen/atm_gcc_atomic.h',
                       'include/grpc/impl/codegen/atm_gcc_sync.h',
-                      'include/grpc/impl/codegen/atm_win32.h',
+                      'include/grpc/impl/codegen/atm_windows.h',
                       'include/grpc/impl/codegen/log.h',
                       'include/grpc/impl/codegen/port_platform.h',
                       'include/grpc/impl/codegen/slice.h',
@@ -116,7 +116,7 @@
                       'include/grpc/impl/codegen/sync.h',
                       'include/grpc/impl/codegen/sync_generic.h',
                       'include/grpc/impl/codegen/sync_posix.h',
-                      'include/grpc/impl/codegen/sync_win32.h',
+                      'include/grpc/impl/codegen/sync_windows.h',
                       'include/grpc/impl/codegen/time.h',
                       'src/core/lib/profiling/basic_timers.c',
                       'src/core/lib/profiling/stap_timers.c',
@@ -130,7 +130,7 @@
                       'src/core/lib/support/cpu_windows.c',
                       'src/core/lib/support/env_linux.c',
                       'src/core/lib/support/env_posix.c',
-                      'src/core/lib/support/env_win32.c',
+                      'src/core/lib/support/env_windows.c',
                       'src/core/lib/support/histogram.c',
                       'src/core/lib/support/host_port.c',
                       'src/core/lib/support/load_file.c',
@@ -138,31 +138,31 @@
                       'src/core/lib/support/log_android.c',
                       'src/core/lib/support/log_linux.c',
                       'src/core/lib/support/log_posix.c',
-                      'src/core/lib/support/log_win32.c',
+                      'src/core/lib/support/log_windows.c',
                       'src/core/lib/support/murmur_hash.c',
                       'src/core/lib/support/slice.c',
                       'src/core/lib/support/slice_buffer.c',
                       'src/core/lib/support/stack_lockfree.c',
                       'src/core/lib/support/string.c',
                       'src/core/lib/support/string_posix.c',
-                      'src/core/lib/support/string_util_win32.c',
-                      'src/core/lib/support/string_win32.c',
+                      'src/core/lib/support/string_util_windows.c',
+                      'src/core/lib/support/string_windows.c',
                       'src/core/lib/support/subprocess_posix.c',
                       'src/core/lib/support/subprocess_windows.c',
                       'src/core/lib/support/sync.c',
                       'src/core/lib/support/sync_posix.c',
-                      'src/core/lib/support/sync_win32.c',
+                      'src/core/lib/support/sync_windows.c',
                       'src/core/lib/support/thd.c',
                       'src/core/lib/support/thd_posix.c',
-                      'src/core/lib/support/thd_win32.c',
+                      'src/core/lib/support/thd_windows.c',
                       'src/core/lib/support/time.c',
                       'src/core/lib/support/time_posix.c',
                       'src/core/lib/support/time_precise.c',
-                      'src/core/lib/support/time_win32.c',
+                      'src/core/lib/support/time_windows.c',
                       'src/core/lib/support/tls_pthread.c',
                       'src/core/lib/support/tmpfile_msys.c',
                       'src/core/lib/support/tmpfile_posix.c',
-                      'src/core/lib/support/tmpfile_win32.c',
+                      'src/core/lib/support/tmpfile_windows.c',
                       'src/core/lib/support/wrap_memcpy.c',
                       'src/core/lib/channel/channel_args.h',
                       'src/core/lib/channel/channel_stack.h',
@@ -197,7 +197,7 @@
                       'src/core/lib/iomgr/sockaddr.h',
                       'src/core/lib/iomgr/sockaddr_posix.h',
                       'src/core/lib/iomgr/sockaddr_utils.h',
-                      'src/core/lib/iomgr/sockaddr_win32.h',
+                      'src/core/lib/iomgr/sockaddr_windows.h',
                       'src/core/lib/iomgr/socket_utils_posix.h',
                       'src/core/lib/iomgr/socket_windows.h',
                       'src/core/lib/iomgr/tcp_client.h',
@@ -326,7 +326,7 @@
                       'include/grpc/impl/codegen/atm.h',
                       'include/grpc/impl/codegen/atm_gcc_atomic.h',
                       'include/grpc/impl/codegen/atm_gcc_sync.h',
-                      'include/grpc/impl/codegen/atm_win32.h',
+                      'include/grpc/impl/codegen/atm_windows.h',
                       'include/grpc/impl/codegen/log.h',
                       'include/grpc/impl/codegen/port_platform.h',
                       'include/grpc/impl/codegen/slice.h',
@@ -334,7 +334,7 @@
                       'include/grpc/impl/codegen/sync.h',
                       'include/grpc/impl/codegen/sync_generic.h',
                       'include/grpc/impl/codegen/sync_posix.h',
-                      'include/grpc/impl/codegen/sync_win32.h',
+                      'include/grpc/impl/codegen/sync_windows.h',
                       'include/grpc/impl/codegen/time.h',
                       'include/grpc/grpc_cronet.h',
                       'include/grpc/grpc_security.h',
@@ -452,7 +452,7 @@
                       'src/core/lib/security/credentials/credentials_metadata.c',
                       'src/core/lib/security/credentials/fake/fake_credentials.c',
                       'src/core/lib/security/credentials/google_default/credentials_posix.c',
-                      'src/core/lib/security/credentials/google_default/credentials_win32.c',
+                      'src/core/lib/security/credentials/google_default/credentials_windows.c',
                       'src/core/lib/security/credentials/google_default/google_default_credentials.c',
                       'src/core/lib/security/credentials/iam/iam_credentials.c',
                       'src/core/lib/security/credentials/jwt/json_token.c',
@@ -525,7 +525,7 @@
                               'src/core/lib/support/murmur_hash.h',
                               'src/core/lib/support/stack_lockfree.h',
                               'src/core/lib/support/string.h',
-                              'src/core/lib/support/string_win32.h',
+                              'src/core/lib/support/string_windows.h',
                               'src/core/lib/support/thd_internal.h',
                               'src/core/lib/support/time_precise.h',
                               'src/core/lib/support/tmpfile.h',
@@ -562,7 +562,7 @@
                               'src/core/lib/iomgr/sockaddr.h',
                               'src/core/lib/iomgr/sockaddr_posix.h',
                               'src/core/lib/iomgr/sockaddr_utils.h',
-                              'src/core/lib/iomgr/sockaddr_win32.h',
+                              'src/core/lib/iomgr/sockaddr_windows.h',
                               'src/core/lib/iomgr/socket_utils_posix.h',
                               'src/core/lib/iomgr/socket_windows.h',
                               'src/core/lib/iomgr/tcp_client.h',
diff --git a/grpc.gemspec b/grpc.gemspec
index ae7f9b7..e7e7173 100755
--- a/grpc.gemspec
+++ b/grpc.gemspec
@@ -47,14 +47,14 @@
   s.files += %w( include/grpc/support/atm.h )
   s.files += %w( include/grpc/support/atm_gcc_atomic.h )
   s.files += %w( include/grpc/support/atm_gcc_sync.h )
-  s.files += %w( include/grpc/support/atm_win32.h )
+  s.files += %w( include/grpc/support/atm_windows.h )
   s.files += %w( include/grpc/support/avl.h )
   s.files += %w( include/grpc/support/cmdline.h )
   s.files += %w( include/grpc/support/cpu.h )
   s.files += %w( include/grpc/support/histogram.h )
   s.files += %w( include/grpc/support/host_port.h )
   s.files += %w( include/grpc/support/log.h )
-  s.files += %w( include/grpc/support/log_win32.h )
+  s.files += %w( include/grpc/support/log_windows.h )
   s.files += %w( include/grpc/support/port_platform.h )
   s.files += %w( include/grpc/support/slice.h )
   s.files += %w( include/grpc/support/slice_buffer.h )
@@ -63,7 +63,7 @@
   s.files += %w( include/grpc/support/sync.h )
   s.files += %w( include/grpc/support/sync_generic.h )
   s.files += %w( include/grpc/support/sync_posix.h )
-  s.files += %w( include/grpc/support/sync_win32.h )
+  s.files += %w( include/grpc/support/sync_windows.h )
   s.files += %w( include/grpc/support/thd.h )
   s.files += %w( include/grpc/support/time.h )
   s.files += %w( include/grpc/support/tls.h )
@@ -75,7 +75,7 @@
   s.files += %w( include/grpc/impl/codegen/atm.h )
   s.files += %w( include/grpc/impl/codegen/atm_gcc_atomic.h )
   s.files += %w( include/grpc/impl/codegen/atm_gcc_sync.h )
-  s.files += %w( include/grpc/impl/codegen/atm_win32.h )
+  s.files += %w( include/grpc/impl/codegen/atm_windows.h )
   s.files += %w( include/grpc/impl/codegen/log.h )
   s.files += %w( include/grpc/impl/codegen/port_platform.h )
   s.files += %w( include/grpc/impl/codegen/slice.h )
@@ -83,7 +83,7 @@
   s.files += %w( include/grpc/impl/codegen/sync.h )
   s.files += %w( include/grpc/impl/codegen/sync_generic.h )
   s.files += %w( include/grpc/impl/codegen/sync_posix.h )
-  s.files += %w( include/grpc/impl/codegen/sync_win32.h )
+  s.files += %w( include/grpc/impl/codegen/sync_windows.h )
   s.files += %w( include/grpc/impl/codegen/time.h )
   s.files += %w( src/core/lib/profiling/timers.h )
   s.files += %w( src/core/lib/support/backoff.h )
@@ -93,7 +93,7 @@
   s.files += %w( src/core/lib/support/murmur_hash.h )
   s.files += %w( src/core/lib/support/stack_lockfree.h )
   s.files += %w( src/core/lib/support/string.h )
-  s.files += %w( src/core/lib/support/string_win32.h )
+  s.files += %w( src/core/lib/support/string_windows.h )
   s.files += %w( src/core/lib/support/thd_internal.h )
   s.files += %w( src/core/lib/support/time_precise.h )
   s.files += %w( src/core/lib/support/tmpfile.h )
@@ -109,7 +109,7 @@
   s.files += %w( src/core/lib/support/cpu_windows.c )
   s.files += %w( src/core/lib/support/env_linux.c )
   s.files += %w( src/core/lib/support/env_posix.c )
-  s.files += %w( src/core/lib/support/env_win32.c )
+  s.files += %w( src/core/lib/support/env_windows.c )
   s.files += %w( src/core/lib/support/histogram.c )
   s.files += %w( src/core/lib/support/host_port.c )
   s.files += %w( src/core/lib/support/load_file.c )
@@ -117,31 +117,31 @@
   s.files += %w( src/core/lib/support/log_android.c )
   s.files += %w( src/core/lib/support/log_linux.c )
   s.files += %w( src/core/lib/support/log_posix.c )
-  s.files += %w( src/core/lib/support/log_win32.c )
+  s.files += %w( src/core/lib/support/log_windows.c )
   s.files += %w( src/core/lib/support/murmur_hash.c )
   s.files += %w( src/core/lib/support/slice.c )
   s.files += %w( src/core/lib/support/slice_buffer.c )
   s.files += %w( src/core/lib/support/stack_lockfree.c )
   s.files += %w( src/core/lib/support/string.c )
   s.files += %w( src/core/lib/support/string_posix.c )
-  s.files += %w( src/core/lib/support/string_util_win32.c )
-  s.files += %w( src/core/lib/support/string_win32.c )
+  s.files += %w( src/core/lib/support/string_util_windows.c )
+  s.files += %w( src/core/lib/support/string_windows.c )
   s.files += %w( src/core/lib/support/subprocess_posix.c )
   s.files += %w( src/core/lib/support/subprocess_windows.c )
   s.files += %w( src/core/lib/support/sync.c )
   s.files += %w( src/core/lib/support/sync_posix.c )
-  s.files += %w( src/core/lib/support/sync_win32.c )
+  s.files += %w( src/core/lib/support/sync_windows.c )
   s.files += %w( src/core/lib/support/thd.c )
   s.files += %w( src/core/lib/support/thd_posix.c )
-  s.files += %w( src/core/lib/support/thd_win32.c )
+  s.files += %w( src/core/lib/support/thd_windows.c )
   s.files += %w( src/core/lib/support/time.c )
   s.files += %w( src/core/lib/support/time_posix.c )
   s.files += %w( src/core/lib/support/time_precise.c )
-  s.files += %w( src/core/lib/support/time_win32.c )
+  s.files += %w( src/core/lib/support/time_windows.c )
   s.files += %w( src/core/lib/support/tls_pthread.c )
   s.files += %w( src/core/lib/support/tmpfile_msys.c )
   s.files += %w( src/core/lib/support/tmpfile_posix.c )
-  s.files += %w( src/core/lib/support/tmpfile_win32.c )
+  s.files += %w( src/core/lib/support/tmpfile_windows.c )
   s.files += %w( src/core/lib/support/wrap_memcpy.c )
   s.files += %w( include/grpc/byte_buffer.h )
   s.files += %w( include/grpc/byte_buffer_reader.h )
@@ -159,7 +159,7 @@
   s.files += %w( include/grpc/impl/codegen/atm.h )
   s.files += %w( include/grpc/impl/codegen/atm_gcc_atomic.h )
   s.files += %w( include/grpc/impl/codegen/atm_gcc_sync.h )
-  s.files += %w( include/grpc/impl/codegen/atm_win32.h )
+  s.files += %w( include/grpc/impl/codegen/atm_windows.h )
   s.files += %w( include/grpc/impl/codegen/log.h )
   s.files += %w( include/grpc/impl/codegen/port_platform.h )
   s.files += %w( include/grpc/impl/codegen/slice.h )
@@ -167,7 +167,7 @@
   s.files += %w( include/grpc/impl/codegen/sync.h )
   s.files += %w( include/grpc/impl/codegen/sync_generic.h )
   s.files += %w( include/grpc/impl/codegen/sync_posix.h )
-  s.files += %w( include/grpc/impl/codegen/sync_win32.h )
+  s.files += %w( include/grpc/impl/codegen/sync_windows.h )
   s.files += %w( include/grpc/impl/codegen/time.h )
   s.files += %w( include/grpc/grpc_cronet.h )
   s.files += %w( include/grpc/grpc_security.h )
@@ -206,7 +206,7 @@
   s.files += %w( src/core/lib/iomgr/sockaddr.h )
   s.files += %w( src/core/lib/iomgr/sockaddr_posix.h )
   s.files += %w( src/core/lib/iomgr/sockaddr_utils.h )
-  s.files += %w( src/core/lib/iomgr/sockaddr_win32.h )
+  s.files += %w( src/core/lib/iomgr/sockaddr_windows.h )
   s.files += %w( src/core/lib/iomgr/socket_utils_posix.h )
   s.files += %w( src/core/lib/iomgr/socket_windows.h )
   s.files += %w( src/core/lib/iomgr/tcp_client.h )
@@ -431,7 +431,7 @@
   s.files += %w( src/core/lib/security/credentials/credentials_metadata.c )
   s.files += %w( src/core/lib/security/credentials/fake/fake_credentials.c )
   s.files += %w( src/core/lib/security/credentials/google_default/credentials_posix.c )
-  s.files += %w( src/core/lib/security/credentials/google_default/credentials_win32.c )
+  s.files += %w( src/core/lib/security/credentials/google_default/credentials_windows.c )
   s.files += %w( src/core/lib/security/credentials/google_default/google_default_credentials.c )
   s.files += %w( src/core/lib/security/credentials/iam/iam_credentials.c )
   s.files += %w( src/core/lib/security/credentials/jwt/json_token.c )
diff --git a/include/grpc/impl/codegen/atm.h b/include/grpc/impl/codegen/atm.h
index 5376026..5589d5d 100644
--- a/include/grpc/impl/codegen/atm.h
+++ b/include/grpc/impl/codegen/atm.h
@@ -83,8 +83,8 @@
 #include <grpc/impl/codegen/atm_gcc_atomic.h>
 #elif defined(GPR_GCC_SYNC)
 #include <grpc/impl/codegen/atm_gcc_sync.h>
-#elif defined(GPR_WIN32_ATOMIC)
-#include <grpc/impl/codegen/atm_win32.h>
+#elif defined(GPR_WINDOWS_ATOMIC)
+#include <grpc/impl/codegen/atm_windows.h>
 #else
 #error could not determine platform for atm
 #endif
diff --git a/include/grpc/impl/codegen/atm_win32.h b/include/grpc/impl/codegen/atm_windows.h
similarity index 96%
rename from include/grpc/impl/codegen/atm_win32.h
rename to include/grpc/impl/codegen/atm_windows.h
index 7c1ccaf..d5fa8c0 100644
--- a/include/grpc/impl/codegen/atm_win32.h
+++ b/include/grpc/impl/codegen/atm_windows.h
@@ -31,8 +31,8 @@
  *
  */
 
-#ifndef GRPC_IMPL_CODEGEN_ATM_WIN32_H
-#define GRPC_IMPL_CODEGEN_ATM_WIN32_H
+#ifndef GRPC_IMPL_CODEGEN_ATM_WINDOWS_H
+#define GRPC_IMPL_CODEGEN_ATM_WINDOWS_H
 
 /* Win32 variant of atm_platform.h */
 #include <grpc/impl/codegen/port_platform.h>
@@ -122,4 +122,4 @@
   return old;
 }
 
-#endif /* GRPC_IMPL_CODEGEN_ATM_WIN32_H */
+#endif /* GRPC_IMPL_CODEGEN_ATM_WINDOWS_H */
diff --git a/include/grpc/impl/codegen/port_platform.h b/include/grpc/impl/codegen/port_platform.h
index d2d9ac7..be4215a 100644
--- a/include/grpc/impl/codegen/port_platform.h
+++ b/include/grpc/impl/codegen/port_platform.h
@@ -89,10 +89,10 @@
 #define GPR_ARCH_32 1
 #endif
 #define GPR_PLATFORM_STRING "windows"
-#define GPR_WIN32 1
+#define GPR_WINDOWS 1
 #define GPR_WINSOCK_SOCKET 1
 #define GPR_WINDOWS_SUBPROCESS 1
-#define GPR_WIN32_ENV
+#define GPR_WINDOWS_ENV
 #ifdef __MSYS__
 #define GPR_GETPID_IN_UNISTD_H 1
 #define GPR_MSYS_TMPFILE
@@ -101,17 +101,17 @@
 #define GPR_POSIX_TIME
 #else
 #define GPR_GETPID_IN_PROCESS_H 1
-#define GPR_WIN32_TMPFILE
-#define GPR_WIN32_LOG
+#define GPR_WINDOWS_TMPFILE
+#define GPR_WINDOWS_LOG
 #define GPR_WINDOWS_CRASH_HANDLER 1
-#define GPR_WIN32_STRING
-#define GPR_WIN32_TIME
+#define GPR_WINDOWS_STRING
+#define GPR_WINDOWS_TIME
 #endif
 #ifdef __GNUC__
 #define GPR_GCC_ATOMIC 1
 #define GPR_GCC_TLS 1
 #else
-#define GPR_WIN32_ATOMIC 1
+#define GPR_WINDOWS_ATOMIC 1
 #define GPR_MSVC_TLS 1
 #endif
 #elif defined(GPR_MANYLINUX1)
@@ -386,19 +386,19 @@
 
 /* Validate platform combinations */
 #if defined(GPR_GCC_ATOMIC) + defined(GPR_GCC_SYNC) + \
-        defined(GPR_WIN32_ATOMIC) !=                  \
+        defined(GPR_WINDOWS_ATOMIC) !=                \
     1
-#error Must define exactly one of GPR_GCC_ATOMIC, GPR_GCC_SYNC, GPR_WIN32_ATOMIC
+#error Must define exactly one of GPR_GCC_ATOMIC, GPR_GCC_SYNC, GPR_WINDOWS_ATOMIC
 #endif
 
 #if defined(GPR_ARCH_32) + defined(GPR_ARCH_64) != 1
 #error Must define exactly one of GPR_ARCH_32, GPR_ARCH_64
 #endif
 
-#if defined(GPR_CPU_LINUX) + defined(GPR_CPU_POSIX) + defined(GPR_WIN32) + \
-        defined(GPR_CPU_IPHONE) + defined(GPR_CPU_CUSTOM) !=               \
+#if defined(GPR_CPU_LINUX) + defined(GPR_CPU_POSIX) + defined(GPR_WINDOWS) + \
+        defined(GPR_CPU_IPHONE) + defined(GPR_CPU_CUSTOM) !=                 \
     1
-#error Must define exactly one of GPR_CPU_LINUX, GPR_CPU_POSIX, GPR_WIN32, GPR_CPU_IPHONE, GPR_CPU_CUSTOM
+#error Must define exactly one of GPR_CPU_LINUX, GPR_CPU_POSIX, GPR_WINDOWS, GPR_CPU_IPHONE, GPR_CPU_CUSTOM
 #endif
 
 #if defined(GPR_POSIX_MULTIPOLL_WITH_POLL) && !defined(GPR_POSIX_SOCKET)
diff --git a/include/grpc/impl/codegen/sync.h b/include/grpc/impl/codegen/sync.h
index 6fd7d64..5542482 100644
--- a/include/grpc/impl/codegen/sync.h
+++ b/include/grpc/impl/codegen/sync.h
@@ -58,8 +58,8 @@
 
 #if defined(GPR_POSIX_SYNC)
 #include <grpc/impl/codegen/sync_posix.h>
-#elif defined(GPR_WIN32)
-#include <grpc/impl/codegen/sync_win32.h>
+#elif defined(GPR_WINDOWS)
+#include <grpc/impl/codegen/sync_windows.h>
 #elif !defined(GPR_CUSTOM_SYNC)
 #error Unable to determine platform for sync
 #endif
diff --git a/include/grpc/impl/codegen/sync_win32.h b/include/grpc/impl/codegen/sync_windows.h
similarity index 93%
rename from include/grpc/impl/codegen/sync_win32.h
rename to include/grpc/impl/codegen/sync_windows.h
index bdc43dd..aa4e515 100644
--- a/include/grpc/impl/codegen/sync_win32.h
+++ b/include/grpc/impl/codegen/sync_windows.h
@@ -31,8 +31,8 @@
  *
  */
 
-#ifndef GRPC_IMPL_CODEGEN_SYNC_WIN32_H
-#define GRPC_IMPL_CODEGEN_SYNC_WIN32_H
+#ifndef GRPC_IMPL_CODEGEN_SYNC_WINDOWS_H
+#define GRPC_IMPL_CODEGEN_SYNC_WINDOWS_H
 
 #include <grpc/impl/codegen/sync_generic.h>
 
@@ -46,4 +46,4 @@
 typedef INIT_ONCE gpr_once;
 #define GPR_ONCE_INIT INIT_ONCE_STATIC_INIT
 
-#endif /* GRPC_IMPL_CODEGEN_SYNC_WIN32_H */
+#endif /* GRPC_IMPL_CODEGEN_SYNC_WINDOWS_H */
diff --git a/include/grpc/support/atm_win32.h b/include/grpc/support/atm_windows.h
similarity index 90%
copy from include/grpc/support/atm_win32.h
copy to include/grpc/support/atm_windows.h
index 13526d9..6aec5b7 100644
--- a/include/grpc/support/atm_win32.h
+++ b/include/grpc/support/atm_windows.h
@@ -31,9 +31,9 @@
  *
  */
 
-#ifndef GRPC_SUPPORT_ATM_WIN32_H
-#define GRPC_SUPPORT_ATM_WIN32_H
+#ifndef GRPC_SUPPORT_ATM_WINDOWS_H
+#define GRPC_SUPPORT_ATM_WINDOWS_H
 
-#include <grpc/impl/codegen/atm_win32.h>
+#include <grpc/impl/codegen/atm_windows.h>
 
-#endif /* GRPC_SUPPORT_ATM_WIN32_H */
+#endif /* GRPC_SUPPORT_ATM_WINDOWS_H */
diff --git a/include/grpc/support/log_win32.h b/include/grpc/support/log_windows.h
similarity index 94%
rename from include/grpc/support/log_win32.h
rename to include/grpc/support/log_windows.h
index e5c25e0..12bf8cc 100644
--- a/include/grpc/support/log_win32.h
+++ b/include/grpc/support/log_windows.h
@@ -31,8 +31,8 @@
  *
  */
 
-#ifndef GRPC_SUPPORT_LOG_WIN32_H
-#define GRPC_SUPPORT_LOG_WIN32_H
+#ifndef GRPC_SUPPORT_LOG_WINDOWS_H
+#define GRPC_SUPPORT_LOG_WINDOWS_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -48,4 +48,4 @@
 }
 #endif
 
-#endif /* GRPC_SUPPORT_LOG_WIN32_H */
+#endif /* GRPC_SUPPORT_LOG_WINDOWS_H */
diff --git a/include/grpc/support/sync_win32.h b/include/grpc/support/sync_win32.h
deleted file mode 100644
index 5631c52..0000000
--- a/include/grpc/support/sync_win32.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *
- * Copyright 2015, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef GRPC_SUPPORT_SYNC_WIN32_H
-#define GRPC_SUPPORT_SYNC_WIN32_H
-
-#include <grpc/impl/codegen/sync_win32.h>
-
-#endif /* GRPC_SUPPORT_SYNC_WIN32_H */
diff --git a/include/grpc/support/atm_win32.h b/include/grpc/support/sync_windows.h
similarity index 90%
rename from include/grpc/support/atm_win32.h
rename to include/grpc/support/sync_windows.h
index 13526d9..0624e0c 100644
--- a/include/grpc/support/atm_win32.h
+++ b/include/grpc/support/sync_windows.h
@@ -31,9 +31,9 @@
  *
  */
 
-#ifndef GRPC_SUPPORT_ATM_WIN32_H
-#define GRPC_SUPPORT_ATM_WIN32_H
+#ifndef GRPC_SUPPORT_SYNC_WINDOWS_H
+#define GRPC_SUPPORT_SYNC_WINDOWS_H
 
-#include <grpc/impl/codegen/atm_win32.h>
+#include <grpc/impl/codegen/sync_windows.h>
 
-#endif /* GRPC_SUPPORT_ATM_WIN32_H */
+#endif /* GRPC_SUPPORT_SYNC_WINDOWS_H */
diff --git a/package.xml b/package.xml
index 507a2a7..2d649d6 100644
--- a/package.xml
+++ b/package.xml
@@ -54,14 +54,14 @@
     <file baseinstalldir="/" name="include/grpc/support/atm.h" role="src" />
     <file baseinstalldir="/" name="include/grpc/support/atm_gcc_atomic.h" role="src" />
     <file baseinstalldir="/" name="include/grpc/support/atm_gcc_sync.h" role="src" />
-    <file baseinstalldir="/" name="include/grpc/support/atm_win32.h" role="src" />
+    <file baseinstalldir="/" name="include/grpc/support/atm_windows.h" role="src" />
     <file baseinstalldir="/" name="include/grpc/support/avl.h" role="src" />
     <file baseinstalldir="/" name="include/grpc/support/cmdline.h" role="src" />
     <file baseinstalldir="/" name="include/grpc/support/cpu.h" role="src" />
     <file baseinstalldir="/" name="include/grpc/support/histogram.h" role="src" />
     <file baseinstalldir="/" name="include/grpc/support/host_port.h" role="src" />
     <file baseinstalldir="/" name="include/grpc/support/log.h" role="src" />
-    <file baseinstalldir="/" name="include/grpc/support/log_win32.h" role="src" />
+    <file baseinstalldir="/" name="include/grpc/support/log_windows.h" role="src" />
     <file baseinstalldir="/" name="include/grpc/support/port_platform.h" role="src" />
     <file baseinstalldir="/" name="include/grpc/support/slice.h" role="src" />
     <file baseinstalldir="/" name="include/grpc/support/slice_buffer.h" role="src" />
@@ -70,7 +70,7 @@
     <file baseinstalldir="/" name="include/grpc/support/sync.h" role="src" />
     <file baseinstalldir="/" name="include/grpc/support/sync_generic.h" role="src" />
     <file baseinstalldir="/" name="include/grpc/support/sync_posix.h" role="src" />
-    <file baseinstalldir="/" name="include/grpc/support/sync_win32.h" role="src" />
+    <file baseinstalldir="/" name="include/grpc/support/sync_windows.h" role="src" />
     <file baseinstalldir="/" name="include/grpc/support/thd.h" role="src" />
     <file baseinstalldir="/" name="include/grpc/support/time.h" role="src" />
     <file baseinstalldir="/" name="include/grpc/support/tls.h" role="src" />
@@ -82,7 +82,7 @@
     <file baseinstalldir="/" name="include/grpc/impl/codegen/atm.h" role="src" />
     <file baseinstalldir="/" name="include/grpc/impl/codegen/atm_gcc_atomic.h" role="src" />
     <file baseinstalldir="/" name="include/grpc/impl/codegen/atm_gcc_sync.h" role="src" />
-    <file baseinstalldir="/" name="include/grpc/impl/codegen/atm_win32.h" role="src" />
+    <file baseinstalldir="/" name="include/grpc/impl/codegen/atm_windows.h" role="src" />
     <file baseinstalldir="/" name="include/grpc/impl/codegen/log.h" role="src" />
     <file baseinstalldir="/" name="include/grpc/impl/codegen/port_platform.h" role="src" />
     <file baseinstalldir="/" name="include/grpc/impl/codegen/slice.h" role="src" />
@@ -90,7 +90,7 @@
     <file baseinstalldir="/" name="include/grpc/impl/codegen/sync.h" role="src" />
     <file baseinstalldir="/" name="include/grpc/impl/codegen/sync_generic.h" role="src" />
     <file baseinstalldir="/" name="include/grpc/impl/codegen/sync_posix.h" role="src" />
-    <file baseinstalldir="/" name="include/grpc/impl/codegen/sync_win32.h" role="src" />
+    <file baseinstalldir="/" name="include/grpc/impl/codegen/sync_windows.h" role="src" />
     <file baseinstalldir="/" name="include/grpc/impl/codegen/time.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/profiling/timers.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/support/backoff.h" role="src" />
@@ -100,7 +100,7 @@
     <file baseinstalldir="/" name="src/core/lib/support/murmur_hash.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/support/stack_lockfree.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/support/string.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/support/string_win32.h" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/support/string_windows.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/support/thd_internal.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/support/time_precise.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/support/tmpfile.h" role="src" />
@@ -116,7 +116,7 @@
     <file baseinstalldir="/" name="src/core/lib/support/cpu_windows.c" role="src" />
     <file baseinstalldir="/" name="src/core/lib/support/env_linux.c" role="src" />
     <file baseinstalldir="/" name="src/core/lib/support/env_posix.c" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/support/env_win32.c" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/support/env_windows.c" role="src" />
     <file baseinstalldir="/" name="src/core/lib/support/histogram.c" role="src" />
     <file baseinstalldir="/" name="src/core/lib/support/host_port.c" role="src" />
     <file baseinstalldir="/" name="src/core/lib/support/load_file.c" role="src" />
@@ -124,31 +124,31 @@
     <file baseinstalldir="/" name="src/core/lib/support/log_android.c" role="src" />
     <file baseinstalldir="/" name="src/core/lib/support/log_linux.c" role="src" />
     <file baseinstalldir="/" name="src/core/lib/support/log_posix.c" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/support/log_win32.c" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/support/log_windows.c" role="src" />
     <file baseinstalldir="/" name="src/core/lib/support/murmur_hash.c" role="src" />
     <file baseinstalldir="/" name="src/core/lib/support/slice.c" role="src" />
     <file baseinstalldir="/" name="src/core/lib/support/slice_buffer.c" role="src" />
     <file baseinstalldir="/" name="src/core/lib/support/stack_lockfree.c" role="src" />
     <file baseinstalldir="/" name="src/core/lib/support/string.c" role="src" />
     <file baseinstalldir="/" name="src/core/lib/support/string_posix.c" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/support/string_util_win32.c" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/support/string_win32.c" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/support/string_util_windows.c" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/support/string_windows.c" role="src" />
     <file baseinstalldir="/" name="src/core/lib/support/subprocess_posix.c" role="src" />
     <file baseinstalldir="/" name="src/core/lib/support/subprocess_windows.c" role="src" />
     <file baseinstalldir="/" name="src/core/lib/support/sync.c" role="src" />
     <file baseinstalldir="/" name="src/core/lib/support/sync_posix.c" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/support/sync_win32.c" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/support/sync_windows.c" role="src" />
     <file baseinstalldir="/" name="src/core/lib/support/thd.c" role="src" />
     <file baseinstalldir="/" name="src/core/lib/support/thd_posix.c" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/support/thd_win32.c" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/support/thd_windows.c" role="src" />
     <file baseinstalldir="/" name="src/core/lib/support/time.c" role="src" />
     <file baseinstalldir="/" name="src/core/lib/support/time_posix.c" role="src" />
     <file baseinstalldir="/" name="src/core/lib/support/time_precise.c" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/support/time_win32.c" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/support/time_windows.c" role="src" />
     <file baseinstalldir="/" name="src/core/lib/support/tls_pthread.c" role="src" />
     <file baseinstalldir="/" name="src/core/lib/support/tmpfile_msys.c" role="src" />
     <file baseinstalldir="/" name="src/core/lib/support/tmpfile_posix.c" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/support/tmpfile_win32.c" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/support/tmpfile_windows.c" role="src" />
     <file baseinstalldir="/" name="src/core/lib/support/wrap_memcpy.c" role="src" />
     <file baseinstalldir="/" name="include/grpc/byte_buffer.h" role="src" />
     <file baseinstalldir="/" name="include/grpc/byte_buffer_reader.h" role="src" />
@@ -166,7 +166,7 @@
     <file baseinstalldir="/" name="include/grpc/impl/codegen/atm.h" role="src" />
     <file baseinstalldir="/" name="include/grpc/impl/codegen/atm_gcc_atomic.h" role="src" />
     <file baseinstalldir="/" name="include/grpc/impl/codegen/atm_gcc_sync.h" role="src" />
-    <file baseinstalldir="/" name="include/grpc/impl/codegen/atm_win32.h" role="src" />
+    <file baseinstalldir="/" name="include/grpc/impl/codegen/atm_windows.h" role="src" />
     <file baseinstalldir="/" name="include/grpc/impl/codegen/log.h" role="src" />
     <file baseinstalldir="/" name="include/grpc/impl/codegen/port_platform.h" role="src" />
     <file baseinstalldir="/" name="include/grpc/impl/codegen/slice.h" role="src" />
@@ -174,7 +174,7 @@
     <file baseinstalldir="/" name="include/grpc/impl/codegen/sync.h" role="src" />
     <file baseinstalldir="/" name="include/grpc/impl/codegen/sync_generic.h" role="src" />
     <file baseinstalldir="/" name="include/grpc/impl/codegen/sync_posix.h" role="src" />
-    <file baseinstalldir="/" name="include/grpc/impl/codegen/sync_win32.h" role="src" />
+    <file baseinstalldir="/" name="include/grpc/impl/codegen/sync_windows.h" role="src" />
     <file baseinstalldir="/" name="include/grpc/impl/codegen/time.h" role="src" />
     <file baseinstalldir="/" name="include/grpc/grpc_cronet.h" role="src" />
     <file baseinstalldir="/" name="include/grpc/grpc_security.h" role="src" />
@@ -213,7 +213,7 @@
     <file baseinstalldir="/" name="src/core/lib/iomgr/sockaddr.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/iomgr/sockaddr_posix.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/iomgr/sockaddr_utils.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/iomgr/sockaddr_win32.h" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/iomgr/sockaddr_windows.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/iomgr/socket_utils_posix.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/iomgr/socket_windows.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/iomgr/tcp_client.h" role="src" />
@@ -438,7 +438,7 @@
     <file baseinstalldir="/" name="src/core/lib/security/credentials/credentials_metadata.c" role="src" />
     <file baseinstalldir="/" name="src/core/lib/security/credentials/fake/fake_credentials.c" role="src" />
     <file baseinstalldir="/" name="src/core/lib/security/credentials/google_default/credentials_posix.c" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/security/credentials/google_default/credentials_win32.c" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/security/credentials/google_default/credentials_windows.c" role="src" />
     <file baseinstalldir="/" name="src/core/lib/security/credentials/google_default/google_default_credentials.c" role="src" />
     <file baseinstalldir="/" name="src/core/lib/security/credentials/iam/iam_credentials.c" role="src" />
     <file baseinstalldir="/" name="src/core/lib/security/credentials/jwt/json_token.c" role="src" />
diff --git a/src/core/lib/iomgr/iocp_windows.c b/src/core/lib/iomgr/iocp_windows.c
index d46558a..7082322 100644
--- a/src/core/lib/iomgr/iocp_windows.c
+++ b/src/core/lib/iomgr/iocp_windows.c
@@ -39,7 +39,7 @@
 
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
-#include <grpc/support/log_win32.h>
+#include <grpc/support/log_windows.h>
 #include <grpc/support/thd.h>
 
 #include "src/core/lib/iomgr/iocp_windows.h"
diff --git a/src/core/lib/iomgr/iomgr_windows.c b/src/core/lib/iomgr/iomgr_windows.c
index 398517f..7653f6e 100644
--- a/src/core/lib/iomgr/iomgr_windows.c
+++ b/src/core/lib/iomgr/iomgr_windows.c
@@ -35,7 +35,7 @@
 
 #ifdef GPR_WINSOCK_SOCKET
 
-#include "src/core/lib/iomgr/sockaddr_win32.h"
+#include "src/core/lib/iomgr/sockaddr_windows.h"
 
 #include <grpc/support/log.h>
 
diff --git a/src/core/lib/iomgr/resolve_address_windows.c b/src/core/lib/iomgr/resolve_address_windows.c
index 9147362..c1bbb3d 100644
--- a/src/core/lib/iomgr/resolve_address_windows.c
+++ b/src/core/lib/iomgr/resolve_address_windows.c
@@ -43,7 +43,7 @@
 #include <grpc/support/alloc.h>
 #include <grpc/support/host_port.h>
 #include <grpc/support/log.h>
-#include <grpc/support/log_win32.h>
+#include <grpc/support/log_windows.h>
 #include <grpc/support/string_util.h>
 #include <grpc/support/thd.h>
 #include <grpc/support/time.h>
diff --git a/src/core/lib/iomgr/sockaddr.h b/src/core/lib/iomgr/sockaddr.h
index 891a2f0..5563d0b 100644
--- a/src/core/lib/iomgr/sockaddr.h
+++ b/src/core/lib/iomgr/sockaddr.h
@@ -36,8 +36,8 @@
 
 #include <grpc/support/port_platform.h>
 
-#ifdef GPR_WIN32
-#include "src/core/lib/iomgr/sockaddr_win32.h"
+#ifdef GPR_WINDOWS
+#include "src/core/lib/iomgr/sockaddr_windows.h"
 #endif
 
 #ifdef GPR_POSIX_SOCKETADDR
diff --git a/src/core/lib/iomgr/sockaddr_win32.h b/src/core/lib/iomgr/sockaddr_windows.h
similarity index 91%
rename from src/core/lib/iomgr/sockaddr_win32.h
rename to src/core/lib/iomgr/sockaddr_windows.h
index 02aeae7..971db5b 100644
--- a/src/core/lib/iomgr/sockaddr_win32.h
+++ b/src/core/lib/iomgr/sockaddr_windows.h
@@ -31,8 +31,8 @@
  *
  */
 
-#ifndef GRPC_CORE_LIB_IOMGR_SOCKADDR_WIN32_H
-#define GRPC_CORE_LIB_IOMGR_SOCKADDR_WIN32_H
+#ifndef GRPC_CORE_LIB_IOMGR_SOCKADDR_WINDOWS_H
+#define GRPC_CORE_LIB_IOMGR_SOCKADDR_WINDOWS_H
 
 #include <winsock2.h>
 #include <ws2tcpip.h>
@@ -40,4 +40,4 @@
 // must be included after the above
 #include <mswsock.h>
 
-#endif /* GRPC_CORE_LIB_IOMGR_SOCKADDR_WIN32_H */
+#endif /* GRPC_CORE_LIB_IOMGR_SOCKADDR_WINDOWS_H */
diff --git a/src/core/lib/iomgr/socket_windows.c b/src/core/lib/iomgr/socket_windows.c
index ebd77e0..7d8f9f7 100644
--- a/src/core/lib/iomgr/socket_windows.c
+++ b/src/core/lib/iomgr/socket_windows.c
@@ -42,7 +42,7 @@
 
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
-#include <grpc/support/log_win32.h>
+#include <grpc/support/log_windows.h>
 #include <grpc/support/string_util.h>
 
 #include "src/core/lib/iomgr/iocp_windows.h"
diff --git a/src/core/lib/iomgr/tcp_client_windows.c b/src/core/lib/iomgr/tcp_client_windows.c
index 66f9ff7..efa0140 100644
--- a/src/core/lib/iomgr/tcp_client_windows.c
+++ b/src/core/lib/iomgr/tcp_client_windows.c
@@ -35,11 +35,11 @@
 
 #ifdef GPR_WINSOCK_SOCKET
 
-#include "src/core/lib/iomgr/sockaddr_win32.h"
+#include "src/core/lib/iomgr/sockaddr_windows.h"
 
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
-#include <grpc/support/log_win32.h>
+#include <grpc/support/log_windows.h>
 #include <grpc/support/slice_buffer.h>
 #include <grpc/support/useful.h>
 
diff --git a/src/core/lib/iomgr/tcp_server_windows.c b/src/core/lib/iomgr/tcp_server_windows.c
index e15f8b0..8a21d93 100644
--- a/src/core/lib/iomgr/tcp_server_windows.c
+++ b/src/core/lib/iomgr/tcp_server_windows.c
@@ -41,7 +41,7 @@
 
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
-#include <grpc/support/log_win32.h>
+#include <grpc/support/log_windows.h>
 #include <grpc/support/string_util.h>
 #include <grpc/support/sync.h>
 #include <grpc/support/time.h>
diff --git a/src/core/lib/iomgr/tcp_windows.c b/src/core/lib/iomgr/tcp_windows.c
index 551149e..f44bf5f 100644
--- a/src/core/lib/iomgr/tcp_windows.c
+++ b/src/core/lib/iomgr/tcp_windows.c
@@ -37,11 +37,11 @@
 
 #include <limits.h>
 
-#include "src/core/lib/iomgr/sockaddr_win32.h"
+#include "src/core/lib/iomgr/sockaddr_windows.h"
 
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
-#include <grpc/support/log_win32.h>
+#include <grpc/support/log_windows.h>
 #include <grpc/support/slice_buffer.h>
 #include <grpc/support/string_util.h>
 #include <grpc/support/useful.h>
diff --git a/src/core/lib/iomgr/workqueue.h b/src/core/lib/iomgr/workqueue.h
index 3e2b223..eeca8c0 100644
--- a/src/core/lib/iomgr/workqueue.h
+++ b/src/core/lib/iomgr/workqueue.h
@@ -43,7 +43,7 @@
 #include "src/core/lib/iomgr/workqueue_posix.h"
 #endif
 
-#ifdef GPR_WIN32
+#ifdef GPR_WINDOWS
 #include "src/core/lib/iomgr/workqueue_windows.h"
 #endif
 
diff --git a/src/core/lib/iomgr/workqueue_windows.c b/src/core/lib/iomgr/workqueue_windows.c
index c3c0446..275f040 100644
--- a/src/core/lib/iomgr/workqueue_windows.c
+++ b/src/core/lib/iomgr/workqueue_windows.c
@@ -33,8 +33,8 @@
 
 #include <grpc/support/port_platform.h>
 
-#ifdef GPR_WIN32
+#ifdef GPR_WINDOWS
 
 #include "src/core/lib/iomgr/workqueue.h"
 
-#endif /* GPR_WIN32 */
+#endif /* GPR_WINDOWS */
diff --git a/src/core/lib/security/credentials/google_default/credentials_win32.c b/src/core/lib/security/credentials/google_default/credentials_windows.c
similarity index 97%
rename from src/core/lib/security/credentials/google_default/credentials_win32.c
rename to src/core/lib/security/credentials/google_default/credentials_windows.c
index cd8b480..208b8fd 100644
--- a/src/core/lib/security/credentials/google_default/credentials_win32.c
+++ b/src/core/lib/security/credentials/google_default/credentials_windows.c
@@ -33,7 +33,7 @@
 
 #include <grpc/support/port_platform.h>
 
-#ifdef GPR_WIN32
+#ifdef GPR_WINDOWS
 
 #include "src/core/lib/security/credentials/google_default/google_default_credentials.h"
 
@@ -58,4 +58,4 @@
   return result;
 }
 
-#endif /* GPR_WIN32 */
+#endif /* GPR_WINDOWS */
diff --git a/src/core/lib/support/cpu_windows.c b/src/core/lib/support/cpu_windows.c
index ce32eb0..34d006b 100644
--- a/src/core/lib/support/cpu_windows.c
+++ b/src/core/lib/support/cpu_windows.c
@@ -33,7 +33,7 @@
 
 #include <grpc/support/port_platform.h>
 
-#ifdef GPR_WIN32
+#ifdef GPR_WINDOWS
 #include <grpc/support/log.h>
 
 unsigned gpr_cpu_num_cores(void) {
@@ -44,4 +44,4 @@
 
 unsigned gpr_cpu_current_cpu(void) { return GetCurrentProcessorNumber(); }
 
-#endif /* GPR_WIN32 */
+#endif /* GPR_WINDOWS */
diff --git a/src/core/lib/support/env_win32.c b/src/core/lib/support/env_windows.c
similarity index 95%
rename from src/core/lib/support/env_win32.c
rename to src/core/lib/support/env_windows.c
index e670e1e..9116959 100644
--- a/src/core/lib/support/env_win32.c
+++ b/src/core/lib/support/env_windows.c
@@ -33,13 +33,13 @@
 
 #include <grpc/support/port_platform.h>
 
-#ifdef GPR_WIN32_ENV
+#ifdef GPR_WINDOWS_ENV
 
 #include <windows.h>
 
 #include "src/core/lib/support/env.h"
 #include "src/core/lib/support/string.h"
-#include "src/core/lib/support/string_win32.h"
+#include "src/core/lib/support/string_windows.h"
 
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
@@ -76,4 +76,4 @@
   GPR_ASSERT(res);
 }
 
-#endif /* GPR_WIN32_ENV */
+#endif /* GPR_WINDOWS_ENV */
diff --git a/src/core/lib/support/log_win32.c b/src/core/lib/support/log_windows.c
similarity index 95%
rename from src/core/lib/support/log_win32.c
rename to src/core/lib/support/log_windows.c
index 29735bd..ea898c3 100644
--- a/src/core/lib/support/log_win32.c
+++ b/src/core/lib/support/log_windows.c
@@ -33,19 +33,19 @@
 
 #include <grpc/support/port_platform.h>
 
-#ifdef GPR_WIN32_LOG
+#ifdef GPR_WINDOWS_LOG
 
 #include <stdarg.h>
 #include <stdio.h>
 
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
-#include <grpc/support/log_win32.h>
+#include <grpc/support/log_windows.h>
 #include <grpc/support/string_util.h>
 #include <grpc/support/time.h>
 
 #include "src/core/lib/support/string.h"
-#include "src/core/lib/support/string_win32.h"
+#include "src/core/lib/support/string_windows.h"
 
 void gpr_log(const char *file, int line, gpr_log_severity severity,
              const char *format, ...) {
@@ -109,4 +109,4 @@
   fflush(stderr);
 }
 
-#endif /* GPR_WIN32_LOG */
+#endif /* GPR_WINDOWS_LOG */
diff --git a/src/core/lib/support/string_util_win32.c b/src/core/lib/support/string_util_windows.c
similarity index 98%
rename from src/core/lib/support/string_util_win32.c
rename to src/core/lib/support/string_util_windows.c
index 0d7bcdb..049c9a8 100644
--- a/src/core/lib/support/string_util_win32.c
+++ b/src/core/lib/support/string_util_windows.c
@@ -35,7 +35,7 @@
 
 #include <grpc/support/port_platform.h>
 
-#ifdef GPR_WIN32
+#ifdef GPR_WINDOWS
 
 /* Some platforms (namely msys) need wchar to be included BEFORE
    anything else, especially strsafe.h. */
@@ -91,4 +91,4 @@
   return message;
 }
 
-#endif /* GPR_WIN32 */
+#endif /* GPR_WINDOWS */
diff --git a/src/core/lib/support/string_win32.c b/src/core/lib/support/string_windows.c
similarity index 97%
rename from src/core/lib/support/string_win32.c
rename to src/core/lib/support/string_windows.c
index 6b92f79..ecc2a3a 100644
--- a/src/core/lib/support/string_win32.c
+++ b/src/core/lib/support/string_windows.c
@@ -35,7 +35,7 @@
 
 #include <grpc/support/port_platform.h>
 
-#ifdef GPR_WIN32_STRING
+#ifdef GPR_WINDOWS_STRING
 
 #include <stdarg.h>
 #include <stdio.h>
@@ -80,4 +80,4 @@
   return -1;
 }
 
-#endif /* GPR_WIN32_STRING */
+#endif /* GPR_WINDOWS_STRING */
diff --git a/src/core/lib/support/string_win32.h b/src/core/lib/support/string_windows.h
similarity index 89%
rename from src/core/lib/support/string_win32.h
rename to src/core/lib/support/string_windows.h
index ff4a694..899563b 100644
--- a/src/core/lib/support/string_win32.h
+++ b/src/core/lib/support/string_windows.h
@@ -31,17 +31,17 @@
  *
  */
 
-#ifndef GRPC_CORE_LIB_SUPPORT_STRING_WIN32_H
-#define GRPC_CORE_LIB_SUPPORT_STRING_WIN32_H
+#ifndef GRPC_CORE_LIB_SUPPORT_STRING_WINDOWS_H
+#define GRPC_CORE_LIB_SUPPORT_STRING_WINDOWS_H
 
 #include <grpc/support/port_platform.h>
 
-#ifdef GPR_WIN32
+#ifdef GPR_WINDOWS
 
 /* These allocate new strings using gpr_malloc to convert from and to utf-8. */
 LPTSTR gpr_char_to_tchar(LPCSTR input);
 LPSTR gpr_tchar_to_char(LPCTSTR input);
 
-#endif /* GPR_WIN32 */
+#endif /* GPR_WINDOWS */
 
-#endif /* GRPC_CORE_LIB_SUPPORT_STRING_WIN32_H */
+#endif /* GRPC_CORE_LIB_SUPPORT_STRING_WINDOWS_H */
diff --git a/src/core/lib/support/subprocess_windows.c b/src/core/lib/support/subprocess_windows.c
index 264306f..dee8c44 100644
--- a/src/core/lib/support/subprocess_windows.c
+++ b/src/core/lib/support/subprocess_windows.c
@@ -43,7 +43,7 @@
 #include <grpc/support/log.h>
 #include <grpc/support/subprocess.h>
 #include "src/core/lib/support/string.h"
-#include "src/core/lib/support/string_win32.h"
+#include "src/core/lib/support/string_windows.h"
 
 struct gpr_subprocess {
   PROCESS_INFORMATION pi;
diff --git a/src/core/lib/support/sync_win32.c b/src/core/lib/support/sync_windows.c
similarity index 98%
rename from src/core/lib/support/sync_win32.c
rename to src/core/lib/support/sync_windows.c
index 470a9f9..8f0e8ff 100644
--- a/src/core/lib/support/sync_win32.c
+++ b/src/core/lib/support/sync_windows.c
@@ -35,7 +35,7 @@
 
 #include <grpc/support/port_platform.h>
 
-#ifdef GPR_WIN32
+#ifdef GPR_WINDOWS
 
 #include <grpc/support/log.h>
 #include <grpc/support/sync.h>
@@ -130,4 +130,4 @@
   InitOnceExecuteOnce(once, run_once_func, &arg, &dummy);
 }
 
-#endif /* GPR_WIN32 */
+#endif /* GPR_WINDOWS */
diff --git a/src/core/lib/support/thd_win32.c b/src/core/lib/support/thd_windows.c
similarity index 98%
rename from src/core/lib/support/thd_win32.c
rename to src/core/lib/support/thd_windows.c
index 6deb314..74d2250 100644
--- a/src/core/lib/support/thd_win32.c
+++ b/src/core/lib/support/thd_windows.c
@@ -35,7 +35,7 @@
 
 #include <grpc/support/port_platform.h>
 
-#ifdef GPR_WIN32
+#ifdef GPR_WINDOWS
 
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
@@ -114,4 +114,4 @@
   destroy_thread(info);
 }
 
-#endif /* GPR_WIN32 */
+#endif /* GPR_WINDOWS */
diff --git a/src/core/lib/support/time_win32.c b/src/core/lib/support/time_windows.c
similarity index 98%
rename from src/core/lib/support/time_win32.c
rename to src/core/lib/support/time_windows.c
index 9e924ab..6459732 100644
--- a/src/core/lib/support/time_win32.c
+++ b/src/core/lib/support/time_windows.c
@@ -35,7 +35,7 @@
 
 #include <grpc/support/port_platform.h>
 
-#ifdef GPR_WIN32_TIME
+#ifdef GPR_WINDOWS_TIME
 
 #include <grpc/support/log.h>
 #include <grpc/support/time.h>
@@ -107,4 +107,4 @@
   }
 }
 
-#endif /* GPR_WIN32_TIME */
+#endif /* GPR_WINDOWS_TIME */
diff --git a/src/core/lib/support/tmpfile_msys.c b/src/core/lib/support/tmpfile_msys.c
index 2fdc89a..4f566c4 100644
--- a/src/core/lib/support/tmpfile_msys.c
+++ b/src/core/lib/support/tmpfile_msys.c
@@ -44,7 +44,7 @@
 #include <grpc/support/log.h>
 #include <grpc/support/string_util.h>
 
-#include "src/core/lib/support/string_win32.h"
+#include "src/core/lib/support/string_windows.h"
 #include "src/core/lib/support/tmpfile.h"
 
 FILE *gpr_tmpfile(const char *prefix, char **tmp_filename_out) {
diff --git a/src/core/lib/support/tmpfile_win32.c b/src/core/lib/support/tmpfile_windows.c
similarity index 95%
rename from src/core/lib/support/tmpfile_win32.c
rename to src/core/lib/support/tmpfile_windows.c
index 9ac7312..542f53e 100644
--- a/src/core/lib/support/tmpfile_win32.c
+++ b/src/core/lib/support/tmpfile_windows.c
@@ -33,7 +33,7 @@
 
 #include <grpc/support/port_platform.h>
 
-#ifdef GPR_WIN32_TMPFILE
+#ifdef GPR_WINDOWS_TMPFILE
 
 #include <io.h>
 #include <stdio.h>
@@ -44,7 +44,7 @@
 #include <grpc/support/log.h>
 #include <grpc/support/string_util.h>
 
-#include "src/core/lib/support/string_win32.h"
+#include "src/core/lib/support/string_windows.h"
 #include "src/core/lib/support/tmpfile.h"
 
 FILE *gpr_tmpfile(const char *prefix, char **tmp_filename_out) {
@@ -81,4 +81,4 @@
   return result;
 }
 
-#endif /* GPR_WIN32_TMPFILE */
+#endif /* GPR_WINDOWS_TMPFILE */
diff --git a/src/csharp/ext/grpc_csharp_ext.c b/src/csharp/ext/grpc_csharp_ext.c
index 4beef9d..2a243b9 100644
--- a/src/csharp/ext/grpc_csharp_ext.c
+++ b/src/csharp/ext/grpc_csharp_ext.c
@@ -45,7 +45,7 @@
 
 #include <string.h>
 
-#ifdef GPR_WIN32
+#ifdef GPR_WINDOWS
 #define GPR_EXPORT __declspec(dllexport)
 #define GPR_CALLTYPE __stdcall
 #endif
diff --git a/src/python/grpcio/grpc/_cython/imports.generated.c b/src/python/grpcio/grpc/_cython/imports.generated.c
index f71cf12..5d09329 100644
--- a/src/python/grpcio/grpc/_cython/imports.generated.c
+++ b/src/python/grpcio/grpc/_cython/imports.generated.c
@@ -35,7 +35,7 @@
 
 #include "imports.generated.h"
 
-#ifdef GPR_WIN32
+#ifdef GPR_WINDOWS
 
 census_initialize_type census_initialize_import;
 census_shutdown_type census_shutdown_import;
@@ -581,4 +581,4 @@
 }
 #endif  /* __cpluslus */
 
-#endif /* !GPR_WIN32 */
+#endif /* !GPR_WINDOWS */
diff --git a/src/python/grpcio/grpc/_cython/imports.generated.h b/src/python/grpcio/grpc/_cython/imports.generated.h
index a364075..cfadad0 100644
--- a/src/python/grpcio/grpc/_cython/imports.generated.h
+++ b/src/python/grpcio/grpc/_cython/imports.generated.h
@@ -36,7 +36,7 @@
 
 #include <grpc/support/port_platform.h>
 
-#ifdef GPR_WIN32
+#ifdef GPR_WINDOWS
 
 #include <windows.h>
 
@@ -57,7 +57,7 @@
 #include <grpc/support/cpu.h>
 #include <grpc/support/histogram.h>
 #include <grpc/support/host_port.h>
-#include <grpc/support/log_win32.h>
+#include <grpc/support/log_windows.h>
 #include <grpc/support/string_util.h>
 #include <grpc/support/subprocess.h>
 #include <grpc/support/thd.h>
@@ -871,7 +871,7 @@
 }
 #endif  /* __cpluslus */
 
-#else /* !GPR_WIN32 */
+#else /* !GPR_WINDOWS */
 
 #include <grpc/byte_buffer.h>
 #include <grpc/byte_buffer_reader.h>
@@ -883,6 +883,6 @@
 #include <grpc/support/time.h>
 #include <grpc/status.h>
 
-#endif /* !GPR_WIN32 */
+#endif /* !GPR_WINDOWS */
 
 #endif
diff --git a/src/python/grpcio/grpc/_cython/loader.c b/src/python/grpcio/grpc/_cython/loader.c
index 3b72806..b909ad5 100644
--- a/src/python/grpcio/grpc/_cython/loader.c
+++ b/src/python/grpcio/grpc/_cython/loader.c
@@ -37,7 +37,7 @@
 extern "C" {
 #endif  /* __cpluslus  */
 
-#if GPR_WIN32
+#if GPR_WINDOWS
 
 int pygrpc_load_core(char *path) {
   HMODULE grpc_c;
@@ -60,7 +60,7 @@
 
 int pygrpc_load_core(char *path) { return 1; }
 
-#endif  /* !GPR_WIN32 */
+#endif  /* !GPR_WINDOWS */
 
 #ifdef __cplusplus
 }
diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py
index be24dc7..d21c0d9 100644
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@@ -42,7 +42,7 @@
   'src/core/lib/support/cpu_windows.c',
   'src/core/lib/support/env_linux.c',
   'src/core/lib/support/env_posix.c',
-  'src/core/lib/support/env_win32.c',
+  'src/core/lib/support/env_windows.c',
   'src/core/lib/support/histogram.c',
   'src/core/lib/support/host_port.c',
   'src/core/lib/support/load_file.c',
@@ -50,31 +50,31 @@
   'src/core/lib/support/log_android.c',
   'src/core/lib/support/log_linux.c',
   'src/core/lib/support/log_posix.c',
-  'src/core/lib/support/log_win32.c',
+  'src/core/lib/support/log_windows.c',
   'src/core/lib/support/murmur_hash.c',
   'src/core/lib/support/slice.c',
   'src/core/lib/support/slice_buffer.c',
   'src/core/lib/support/stack_lockfree.c',
   'src/core/lib/support/string.c',
   'src/core/lib/support/string_posix.c',
-  'src/core/lib/support/string_util_win32.c',
-  'src/core/lib/support/string_win32.c',
+  'src/core/lib/support/string_util_windows.c',
+  'src/core/lib/support/string_windows.c',
   'src/core/lib/support/subprocess_posix.c',
   'src/core/lib/support/subprocess_windows.c',
   'src/core/lib/support/sync.c',
   'src/core/lib/support/sync_posix.c',
-  'src/core/lib/support/sync_win32.c',
+  'src/core/lib/support/sync_windows.c',
   'src/core/lib/support/thd.c',
   'src/core/lib/support/thd_posix.c',
-  'src/core/lib/support/thd_win32.c',
+  'src/core/lib/support/thd_windows.c',
   'src/core/lib/support/time.c',
   'src/core/lib/support/time_posix.c',
   'src/core/lib/support/time_precise.c',
-  'src/core/lib/support/time_win32.c',
+  'src/core/lib/support/time_windows.c',
   'src/core/lib/support/tls_pthread.c',
   'src/core/lib/support/tmpfile_msys.c',
   'src/core/lib/support/tmpfile_posix.c',
-  'src/core/lib/support/tmpfile_win32.c',
+  'src/core/lib/support/tmpfile_windows.c',
   'src/core/lib/support/wrap_memcpy.c',
   'src/core/lib/surface/init.c',
   'src/core/lib/channel/channel_args.c',
diff --git a/src/ruby/ext/grpc/rb_grpc_imports.generated.c b/src/ruby/ext/grpc/rb_grpc_imports.generated.c
index 3b62984..1510191 100644
--- a/src/ruby/ext/grpc/rb_grpc_imports.generated.c
+++ b/src/ruby/ext/grpc/rb_grpc_imports.generated.c
@@ -33,7 +33,7 @@
 
 #include <grpc/support/port_platform.h>
 
-#ifdef GPR_WIN32
+#ifdef GPR_WINDOWS
 
 #include "rb_grpc_imports.generated.h"
 
@@ -573,4 +573,4 @@
   gpr_thd_join_import = (gpr_thd_join_type) GetProcAddress(library, "gpr_thd_join");
 }
 
-#endif /* GPR_WIN32 */
+#endif /* GPR_WINDOWS */
diff --git a/src/ruby/ext/grpc/rb_grpc_imports.generated.h b/src/ruby/ext/grpc/rb_grpc_imports.generated.h
index 1428e6d..dfaabf1 100644
--- a/src/ruby/ext/grpc/rb_grpc_imports.generated.h
+++ b/src/ruby/ext/grpc/rb_grpc_imports.generated.h
@@ -36,7 +36,7 @@
 
 #include <grpc/support/port_platform.h>
 
-#ifdef GPR_WIN32
+#ifdef GPR_WINDOWS
 
 #include <windows.h>
 
@@ -57,7 +57,7 @@
 #include <grpc/support/cpu.h>
 #include <grpc/support/histogram.h>
 #include <grpc/support/host_port.h>
-#include <grpc/support/log_win32.h>
+#include <grpc/support/log_windows.h>
 #include <grpc/support/string_util.h>
 #include <grpc/support/subprocess.h>
 #include <grpc/support/thd.h>
@@ -863,6 +863,6 @@
 
 void grpc_rb_load_imports(HMODULE library);
 
-#endif /* GPR_WIN32 */
+#endif /* GPR_WINDOWS */
 
 #endif
diff --git a/src/ruby/ext/grpc/rb_loader.c b/src/ruby/ext/grpc/rb_loader.c
index 242535f..19a6b33 100644
--- a/src/ruby/ext/grpc/rb_loader.c
+++ b/src/ruby/ext/grpc/rb_loader.c
@@ -33,7 +33,7 @@
 
 #include "rb_grpc_imports.generated.h"
 
-#if GPR_WIN32
+#if GPR_WINDOWS
 #include <tchar.h>
 
 int grpc_rb_load_core() {
diff --git a/templates/src/python/grpcio/grpc/_cython/imports.generated.c.template b/templates/src/python/grpcio/grpc/_cython/imports.generated.c.template
index 62fe094..84fa5e6 100644
--- a/templates/src/python/grpcio/grpc/_cython/imports.generated.c.template
+++ b/templates/src/python/grpcio/grpc/_cython/imports.generated.c.template
@@ -37,7 +37,7 @@
 
   #include "imports.generated.h"
 
-  #ifdef GPR_WIN32
+  #ifdef GPR_WINDOWS
 
   %for api in c_apis:
   ${api.name}_type ${api.name}_import;
@@ -57,5 +57,5 @@
   }
   #endif  /* __cpluslus */
 
-  #endif /* !GPR_WIN32 */
+  #endif /* !GPR_WINDOWS */
 
diff --git a/templates/src/python/grpcio/grpc/_cython/imports.generated.h.template b/templates/src/python/grpcio/grpc/_cython/imports.generated.h.template
index 26e717e..d0f60dc 100644
--- a/templates/src/python/grpcio/grpc/_cython/imports.generated.h.template
+++ b/templates/src/python/grpcio/grpc/_cython/imports.generated.h.template
@@ -38,7 +38,7 @@
 
   #include <grpc/support/port_platform.h>
 
-  #ifdef GPR_WIN32
+  #ifdef GPR_WINDOWS
 
   #include <windows.h>
 
@@ -62,7 +62,7 @@
   }
   #endif  /* __cpluslus */
 
-  #else /* !GPR_WIN32 */
+  #else /* !GPR_WINDOWS */
 
   #include <grpc/byte_buffer.h>
   #include <grpc/byte_buffer_reader.h>
@@ -74,6 +74,6 @@
   #include <grpc/support/time.h>
   #include <grpc/status.h>
 
-  #endif /* !GPR_WIN32 */
+  #endif /* !GPR_WINDOWS */
 
   #endif
diff --git a/templates/src/ruby/ext/grpc/rb_grpc_imports.generated.c.template b/templates/src/ruby/ext/grpc/rb_grpc_imports.generated.c.template
index e09a587..232f3e7 100644
--- a/templates/src/ruby/ext/grpc/rb_grpc_imports.generated.c.template
+++ b/templates/src/ruby/ext/grpc/rb_grpc_imports.generated.c.template
@@ -35,7 +35,7 @@
 
   #include <grpc/support/port_platform.h>
 
-  #ifdef GPR_WIN32
+  #ifdef GPR_WINDOWS
 
   #include "rb_grpc_imports.generated.h"
 
@@ -49,4 +49,4 @@
   %endfor
   }
 
-  #endif /* GPR_WIN32 */
+  #endif /* GPR_WINDOWS */
diff --git a/templates/src/ruby/ext/grpc/rb_grpc_imports.generated.h.template b/templates/src/ruby/ext/grpc/rb_grpc_imports.generated.h.template
index 9f17ede..68172fc 100644
--- a/templates/src/ruby/ext/grpc/rb_grpc_imports.generated.h.template
+++ b/templates/src/ruby/ext/grpc/rb_grpc_imports.generated.h.template
@@ -38,7 +38,7 @@
 
   #include <grpc/support/port_platform.h>
 
-  #ifdef GPR_WIN32
+  #ifdef GPR_WINDOWS
 
   #include <windows.h>
 
@@ -54,6 +54,6 @@
 
   void grpc_rb_load_imports(HMODULE library);
 
-  #endif /* GPR_WIN32 */
+  #endif /* GPR_WINDOWS */
 
   #endif
diff --git a/templates/test/core/surface/public_headers_must_be_c89.c.template b/templates/test/core/surface/public_headers_must_be_c89.c.template
index e132256..f02ef95 100644
--- a/templates/test/core/surface/public_headers_must_be_c89.c.template
+++ b/templates/test/core/surface/public_headers_must_be_c89.c.template
@@ -35,7 +35,7 @@
 
   <%
   def is_platform_header(hdr):
-    for platform_identifier in ['_gcc', '_win32', '_pthread',
+    for platform_identifier in ['_gcc', '_windows', '_pthread',
                                 '_zookeeper', '_msvc', '_posix']:
       if platform_identifier in hdr:
         return True
diff --git a/tools/doxygen/Doxyfile.c++ b/tools/doxygen/Doxyfile.c++
index 798d68b..79c2b38 100644
--- a/tools/doxygen/Doxyfile.c++
+++ b/tools/doxygen/Doxyfile.c++
@@ -845,7 +845,7 @@
 include/grpc/impl/codegen/atm.h \
 include/grpc/impl/codegen/atm_gcc_atomic.h \
 include/grpc/impl/codegen/atm_gcc_sync.h \
-include/grpc/impl/codegen/atm_win32.h \
+include/grpc/impl/codegen/atm_windows.h \
 include/grpc/impl/codegen/log.h \
 include/grpc/impl/codegen/port_platform.h \
 include/grpc/impl/codegen/slice.h \
@@ -853,7 +853,7 @@
 include/grpc/impl/codegen/sync.h \
 include/grpc/impl/codegen/sync_generic.h \
 include/grpc/impl/codegen/sync_posix.h \
-include/grpc/impl/codegen/sync_win32.h \
+include/grpc/impl/codegen/sync_windows.h \
 include/grpc/impl/codegen/time.h \
 include/grpc++/impl/codegen/config.h \
 include/grpc++/impl/codegen/config_protobuf.h \
diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal
index ce1d6ac..fd062b6 100644
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@@ -845,7 +845,7 @@
 include/grpc/impl/codegen/atm.h \
 include/grpc/impl/codegen/atm_gcc_atomic.h \
 include/grpc/impl/codegen/atm_gcc_sync.h \
-include/grpc/impl/codegen/atm_win32.h \
+include/grpc/impl/codegen/atm_windows.h \
 include/grpc/impl/codegen/log.h \
 include/grpc/impl/codegen/port_platform.h \
 include/grpc/impl/codegen/slice.h \
@@ -853,7 +853,7 @@
 include/grpc/impl/codegen/sync.h \
 include/grpc/impl/codegen/sync_generic.h \
 include/grpc/impl/codegen/sync_posix.h \
-include/grpc/impl/codegen/sync_win32.h \
+include/grpc/impl/codegen/sync_windows.h \
 include/grpc/impl/codegen/time.h \
 include/grpc++/impl/codegen/config.h \
 include/grpc++/impl/codegen/config_protobuf.h \
diff --git a/tools/doxygen/Doxyfile.core b/tools/doxygen/Doxyfile.core
index aabca41..f1bd79d 100644
--- a/tools/doxygen/Doxyfile.core
+++ b/tools/doxygen/Doxyfile.core
@@ -776,7 +776,7 @@
 include/grpc/impl/codegen/atm.h \
 include/grpc/impl/codegen/atm_gcc_atomic.h \
 include/grpc/impl/codegen/atm_gcc_sync.h \
-include/grpc/impl/codegen/atm_win32.h \
+include/grpc/impl/codegen/atm_windows.h \
 include/grpc/impl/codegen/log.h \
 include/grpc/impl/codegen/port_platform.h \
 include/grpc/impl/codegen/slice.h \
@@ -784,7 +784,7 @@
 include/grpc/impl/codegen/sync.h \
 include/grpc/impl/codegen/sync_generic.h \
 include/grpc/impl/codegen/sync_posix.h \
-include/grpc/impl/codegen/sync_win32.h \
+include/grpc/impl/codegen/sync_windows.h \
 include/grpc/impl/codegen/time.h \
 include/grpc/grpc_cronet.h \
 include/grpc/grpc_security.h \
@@ -794,14 +794,14 @@
 include/grpc/support/atm.h \
 include/grpc/support/atm_gcc_atomic.h \
 include/grpc/support/atm_gcc_sync.h \
-include/grpc/support/atm_win32.h \
+include/grpc/support/atm_windows.h \
 include/grpc/support/avl.h \
 include/grpc/support/cmdline.h \
 include/grpc/support/cpu.h \
 include/grpc/support/histogram.h \
 include/grpc/support/host_port.h \
 include/grpc/support/log.h \
-include/grpc/support/log_win32.h \
+include/grpc/support/log_windows.h \
 include/grpc/support/port_platform.h \
 include/grpc/support/slice.h \
 include/grpc/support/slice_buffer.h \
@@ -810,7 +810,7 @@
 include/grpc/support/sync.h \
 include/grpc/support/sync_generic.h \
 include/grpc/support/sync_posix.h \
-include/grpc/support/sync_win32.h \
+include/grpc/support/sync_windows.h \
 include/grpc/support/thd.h \
 include/grpc/support/time.h \
 include/grpc/support/tls.h \
@@ -822,7 +822,7 @@
 include/grpc/impl/codegen/atm.h \
 include/grpc/impl/codegen/atm_gcc_atomic.h \
 include/grpc/impl/codegen/atm_gcc_sync.h \
-include/grpc/impl/codegen/atm_win32.h \
+include/grpc/impl/codegen/atm_windows.h \
 include/grpc/impl/codegen/log.h \
 include/grpc/impl/codegen/port_platform.h \
 include/grpc/impl/codegen/slice.h \
@@ -830,7 +830,7 @@
 include/grpc/impl/codegen/sync.h \
 include/grpc/impl/codegen/sync_generic.h \
 include/grpc/impl/codegen/sync_posix.h \
-include/grpc/impl/codegen/sync_win32.h \
+include/grpc/impl/codegen/sync_windows.h \
 include/grpc/impl/codegen/time.h
 
 # This tag can be used to specify the character encoding of the source files
diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal
index c3fd59b..dfc26b6 100644
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@@ -776,7 +776,7 @@
 include/grpc/impl/codegen/atm.h \
 include/grpc/impl/codegen/atm_gcc_atomic.h \
 include/grpc/impl/codegen/atm_gcc_sync.h \
-include/grpc/impl/codegen/atm_win32.h \
+include/grpc/impl/codegen/atm_windows.h \
 include/grpc/impl/codegen/log.h \
 include/grpc/impl/codegen/port_platform.h \
 include/grpc/impl/codegen/slice.h \
@@ -784,7 +784,7 @@
 include/grpc/impl/codegen/sync.h \
 include/grpc/impl/codegen/sync_generic.h \
 include/grpc/impl/codegen/sync_posix.h \
-include/grpc/impl/codegen/sync_win32.h \
+include/grpc/impl/codegen/sync_windows.h \
 include/grpc/impl/codegen/time.h \
 include/grpc/grpc_cronet.h \
 include/grpc/grpc_security.h \
@@ -823,7 +823,7 @@
 src/core/lib/iomgr/sockaddr.h \
 src/core/lib/iomgr/sockaddr_posix.h \
 src/core/lib/iomgr/sockaddr_utils.h \
-src/core/lib/iomgr/sockaddr_win32.h \
+src/core/lib/iomgr/sockaddr_windows.h \
 src/core/lib/iomgr/socket_utils_posix.h \
 src/core/lib/iomgr/socket_windows.h \
 src/core/lib/iomgr/tcp_client.h \
@@ -1048,7 +1048,7 @@
 src/core/lib/security/credentials/credentials_metadata.c \
 src/core/lib/security/credentials/fake/fake_credentials.c \
 src/core/lib/security/credentials/google_default/credentials_posix.c \
-src/core/lib/security/credentials/google_default/credentials_win32.c \
+src/core/lib/security/credentials/google_default/credentials_windows.c \
 src/core/lib/security/credentials/google_default/google_default_credentials.c \
 src/core/lib/security/credentials/iam/iam_credentials.c \
 src/core/lib/security/credentials/jwt/json_token.c \
@@ -1116,14 +1116,14 @@
 include/grpc/support/atm.h \
 include/grpc/support/atm_gcc_atomic.h \
 include/grpc/support/atm_gcc_sync.h \
-include/grpc/support/atm_win32.h \
+include/grpc/support/atm_windows.h \
 include/grpc/support/avl.h \
 include/grpc/support/cmdline.h \
 include/grpc/support/cpu.h \
 include/grpc/support/histogram.h \
 include/grpc/support/host_port.h \
 include/grpc/support/log.h \
-include/grpc/support/log_win32.h \
+include/grpc/support/log_windows.h \
 include/grpc/support/port_platform.h \
 include/grpc/support/slice.h \
 include/grpc/support/slice_buffer.h \
@@ -1132,7 +1132,7 @@
 include/grpc/support/sync.h \
 include/grpc/support/sync_generic.h \
 include/grpc/support/sync_posix.h \
-include/grpc/support/sync_win32.h \
+include/grpc/support/sync_windows.h \
 include/grpc/support/thd.h \
 include/grpc/support/time.h \
 include/grpc/support/tls.h \
@@ -1144,7 +1144,7 @@
 include/grpc/impl/codegen/atm.h \
 include/grpc/impl/codegen/atm_gcc_atomic.h \
 include/grpc/impl/codegen/atm_gcc_sync.h \
-include/grpc/impl/codegen/atm_win32.h \
+include/grpc/impl/codegen/atm_windows.h \
 include/grpc/impl/codegen/log.h \
 include/grpc/impl/codegen/port_platform.h \
 include/grpc/impl/codegen/slice.h \
@@ -1152,7 +1152,7 @@
 include/grpc/impl/codegen/sync.h \
 include/grpc/impl/codegen/sync_generic.h \
 include/grpc/impl/codegen/sync_posix.h \
-include/grpc/impl/codegen/sync_win32.h \
+include/grpc/impl/codegen/sync_windows.h \
 include/grpc/impl/codegen/time.h \
 src/core/lib/profiling/timers.h \
 src/core/lib/support/backoff.h \
@@ -1162,7 +1162,7 @@
 src/core/lib/support/murmur_hash.h \
 src/core/lib/support/stack_lockfree.h \
 src/core/lib/support/string.h \
-src/core/lib/support/string_win32.h \
+src/core/lib/support/string_windows.h \
 src/core/lib/support/thd_internal.h \
 src/core/lib/support/time_precise.h \
 src/core/lib/support/tmpfile.h \
@@ -1178,7 +1178,7 @@
 src/core/lib/support/cpu_windows.c \
 src/core/lib/support/env_linux.c \
 src/core/lib/support/env_posix.c \
-src/core/lib/support/env_win32.c \
+src/core/lib/support/env_windows.c \
 src/core/lib/support/histogram.c \
 src/core/lib/support/host_port.c \
 src/core/lib/support/load_file.c \
@@ -1186,31 +1186,31 @@
 src/core/lib/support/log_android.c \
 src/core/lib/support/log_linux.c \
 src/core/lib/support/log_posix.c \
-src/core/lib/support/log_win32.c \
+src/core/lib/support/log_windows.c \
 src/core/lib/support/murmur_hash.c \
 src/core/lib/support/slice.c \
 src/core/lib/support/slice_buffer.c \
 src/core/lib/support/stack_lockfree.c \
 src/core/lib/support/string.c \
 src/core/lib/support/string_posix.c \
-src/core/lib/support/string_util_win32.c \
-src/core/lib/support/string_win32.c \
+src/core/lib/support/string_util_windows.c \
+src/core/lib/support/string_windows.c \
 src/core/lib/support/subprocess_posix.c \
 src/core/lib/support/subprocess_windows.c \
 src/core/lib/support/sync.c \
 src/core/lib/support/sync_posix.c \
-src/core/lib/support/sync_win32.c \
+src/core/lib/support/sync_windows.c \
 src/core/lib/support/thd.c \
 src/core/lib/support/thd_posix.c \
-src/core/lib/support/thd_win32.c \
+src/core/lib/support/thd_windows.c \
 src/core/lib/support/time.c \
 src/core/lib/support/time_posix.c \
 src/core/lib/support/time_precise.c \
-src/core/lib/support/time_win32.c \
+src/core/lib/support/time_windows.c \
 src/core/lib/support/tls_pthread.c \
 src/core/lib/support/tmpfile_msys.c \
 src/core/lib/support/tmpfile_posix.c \
-src/core/lib/support/tmpfile_win32.c \
+src/core/lib/support/tmpfile_windows.c \
 src/core/lib/support/wrap_memcpy.c
 
 # This tag can be used to specify the character encoding of the source files
diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json
index 24d23fe..2680da3 100644
--- a/tools/run_tests/sources_and_headers.json
+++ b/tools/run_tests/sources_and_headers.json
@@ -3,6514 +3,6514 @@
 [
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "alarm_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "alarm_test",
     "src": [
       "test/core/surface/alarm_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "algorithm_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "algorithm_test",
     "src": [
       "test/core/compression/algorithm_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
+      "gpr",
       "gpr_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "alloc_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "alloc_test",
     "src": [
       "test/core/support/alloc_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "alpn_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "alpn_test",
     "src": [
       "test/core/transport/chttp2/alpn_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "api_fuzzer", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "api_fuzzer",
     "src": [
       "test/core/end2end/fuzzers/api_fuzzer.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "grpc", 
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "bin_encoder_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "bin_encoder_test",
     "src": [
       "test/core/transport/chttp2/bin_encoder_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "census_context_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "census_context_test",
     "src": [
       "test/core/census/context_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "channel_create_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "channel_create_test",
     "src": [
       "test/core/surface/channel_create_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "chttp2_hpack_encoder_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "chttp2_hpack_encoder_test",
     "src": [
       "test/core/transport/chttp2/hpack_encoder_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "chttp2_status_conversion_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "chttp2_status_conversion_test",
     "src": [
       "test/core/transport/chttp2/status_conversion_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "chttp2_stream_map_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "chttp2_stream_map_test",
     "src": [
       "test/core/transport/chttp2/stream_map_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "chttp2_varint_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "chttp2_varint_test",
     "src": [
       "test/core/transport/chttp2/varint_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "client_fuzzer", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "client_fuzzer",
     "src": [
       "test/core/end2end/fuzzers/client_fuzzer.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "compression_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "compression_test",
     "src": [
       "test/core/compression/compression_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "concurrent_connectivity_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "concurrent_connectivity_test",
     "src": [
       "test/core/surface/concurrent_connectivity_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "dns_resolver_connectivity_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "dns_resolver_connectivity_test",
     "src": [
       "test/core/client_config/resolvers/dns_resolver_connectivity_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "dns_resolver_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "dns_resolver_test",
     "src": [
       "test/core/client_config/resolvers/dns_resolver_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "dualstack_socket_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "dualstack_socket_test",
     "src": [
       "test/core/end2end/dualstack_socket_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "endpoint_pair_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "endpoint_pair_test",
     "src": [
       "test/core/iomgr/endpoint_pair_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "fd_conservation_posix_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "fd_conservation_posix_test",
     "src": [
       "test/core/iomgr/fd_conservation_posix_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "fd_posix_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "fd_posix_test",
     "src": [
       "test/core/iomgr/fd_posix_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "fling_client", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "fling_client",
     "src": [
       "test/core/fling/client.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "fling_server", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "fling_server",
     "src": [
       "test/core/fling/server.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "fling_stream_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "fling_stream_test",
     "src": [
       "test/core/fling/fling_stream_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "fling_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "fling_test",
     "src": [
       "test/core/fling/fling_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
+      "gpr",
       "grpc"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "gen_hpack_tables", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "gen_hpack_tables",
     "src": [
       "tools/codegen/core/gen_hpack_tables.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
-    "deps": [], 
-    "headers": [], 
-    "language": "c", 
-    "name": "gen_legal_metadata_characters", 
+    "deps": [],
+    "headers": [],
+    "language": "c",
+    "name": "gen_legal_metadata_characters",
     "src": [
       "tools/codegen/core/gen_legal_metadata_characters.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "goaway_server_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "goaway_server_test",
     "src": [
       "test/core/end2end/goaway_server_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
+      "gpr",
       "gpr_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "gpr_avl_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "gpr_avl_test",
     "src": [
       "test/core/support/avl_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
+      "gpr",
       "gpr_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "gpr_backoff_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "gpr_backoff_test",
     "src": [
       "test/core/support/backoff_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
+      "gpr",
       "gpr_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "gpr_cmdline_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "gpr_cmdline_test",
     "src": [
       "test/core/support/cmdline_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
+      "gpr",
       "gpr_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "gpr_cpu_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "gpr_cpu_test",
     "src": [
       "test/core/support/cpu_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
+      "gpr",
       "gpr_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "gpr_env_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "gpr_env_test",
     "src": [
       "test/core/support/env_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
+      "gpr",
       "gpr_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "gpr_histogram_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "gpr_histogram_test",
     "src": [
       "test/core/support/histogram_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
+      "gpr",
       "gpr_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "gpr_host_port_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "gpr_host_port_test",
     "src": [
       "test/core/support/host_port_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
+      "gpr",
       "gpr_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "gpr_load_file_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "gpr_load_file_test",
     "src": [
       "test/core/support/load_file_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
+      "gpr",
       "gpr_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "gpr_log_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "gpr_log_test",
     "src": [
       "test/core/support/log_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
+      "gpr",
       "gpr_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "gpr_slice_buffer_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "gpr_slice_buffer_test",
     "src": [
       "test/core/support/slice_buffer_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
+      "gpr",
       "gpr_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "gpr_slice_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "gpr_slice_test",
     "src": [
       "test/core/support/slice_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
+      "gpr",
       "gpr_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "gpr_stack_lockfree_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "gpr_stack_lockfree_test",
     "src": [
       "test/core/support/stack_lockfree_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
+      "gpr",
       "gpr_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "gpr_string_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "gpr_string_test",
     "src": [
       "test/core/support/string_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
+      "gpr",
       "gpr_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "gpr_sync_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "gpr_sync_test",
     "src": [
       "test/core/support/sync_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
+      "gpr",
       "gpr_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "gpr_thd_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "gpr_thd_test",
     "src": [
       "test/core/support/thd_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
+      "gpr",
       "gpr_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "gpr_time_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "gpr_time_test",
     "src": [
       "test/core/support/time_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
+      "gpr",
       "gpr_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "gpr_tls_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "gpr_tls_test",
     "src": [
       "test/core/support/tls_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
+      "gpr",
       "gpr_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "gpr_useful_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "gpr_useful_test",
     "src": [
       "test/core/support/useful_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "grpc_auth_context_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "grpc_auth_context_test",
     "src": [
       "test/core/security/auth_context_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "grpc_b64_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "grpc_b64_test",
     "src": [
       "test/core/security/b64_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "grpc_byte_buffer_reader_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "grpc_byte_buffer_reader_test",
     "src": [
       "test/core/surface/byte_buffer_reader_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "grpc_channel_args_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "grpc_channel_args_test",
     "src": [
       "test/core/channel/channel_args_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "grpc_channel_stack_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "grpc_channel_stack_test",
     "src": [
       "test/core/channel/channel_stack_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "grpc_completion_queue_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "grpc_completion_queue_test",
     "src": [
       "test/core/surface/completion_queue_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "grpc_create_jwt", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "grpc_create_jwt",
     "src": [
       "test/core/security/create_jwt.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "grpc_credentials_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "grpc_credentials_test",
     "src": [
       "test/core/security/credentials_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "grpc_fetch_oauth2", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "grpc_fetch_oauth2",
     "src": [
       "test/core/security/fetch_oauth2.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "grpc_invalid_channel_args_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "grpc_invalid_channel_args_test",
     "src": [
       "test/core/surface/invalid_channel_args_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "grpc_json_token_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "grpc_json_token_test",
     "src": [
       "test/core/security/json_token_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "grpc_jwt_verifier_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "grpc_jwt_verifier_test",
     "src": [
       "test/core/security/jwt_verifier_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "grpc_print_google_default_creds_token", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "grpc_print_google_default_creds_token",
     "src": [
       "test/core/security/print_google_default_creds_token.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "grpc_security_connector_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "grpc_security_connector_test",
     "src": [
       "test/core/security/security_connector_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "grpc_verify_jwt", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "grpc_verify_jwt",
     "src": [
       "test/core/security/verify_jwt.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "hpack_parser_fuzzer_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "hpack_parser_fuzzer_test",
     "src": [
       "test/core/transport/chttp2/hpack_parser_fuzzer_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "hpack_parser_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "hpack_parser_test",
     "src": [
       "test/core/transport/chttp2/hpack_parser_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "hpack_table_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "hpack_table_test",
     "src": [
       "test/core/transport/chttp2/hpack_table_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "http_fuzzer_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "http_fuzzer_test",
     "src": [
       "test/core/http/fuzzer.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "http_parser_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "http_parser_test",
     "src": [
       "test/core/http/parser_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "httpcli_format_request_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "httpcli_format_request_test",
     "src": [
       "test/core/http/format_request_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "httpcli_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "httpcli_test",
     "src": [
       "test/core/http/httpcli_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "httpscli_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "httpscli_test",
     "src": [
       "test/core/http/httpscli_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "init_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "init_test",
     "src": [
       "test/core/surface/init_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "internal_api_canary_iomgr_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "internal_api_canary_iomgr_test",
     "src": [
       "test/core/internal_api_canaries/iomgr.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "internal_api_canary_support_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "internal_api_canary_support_test",
     "src": [
       "test/core/internal_api_canaries/iomgr.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "internal_api_canary_transport_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "internal_api_canary_transport_test",
     "src": [
       "test/core/internal_api_canaries/iomgr.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "invalid_call_argument_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "invalid_call_argument_test",
     "src": [
       "test/core/end2end/invalid_call_argument_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "json_fuzzer_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "json_fuzzer_test",
     "src": [
       "test/core/json/fuzzer.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
+      "gpr",
       "grpc"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "json_rewrite", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "json_rewrite",
     "src": [
       "test/core/json/json_rewrite.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "json_rewrite_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "json_rewrite_test",
     "src": [
       "test/core/json/json_rewrite_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "json_stream_error_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "json_stream_error_test",
     "src": [
       "test/core/json/json_stream_error_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "json_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "json_test",
     "src": [
       "test/core/json/json_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "lame_client_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "lame_client_test",
     "src": [
       "test/core/surface/lame_client_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "lb_policies_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "lb_policies_test",
     "src": [
       "test/core/client_config/lb_policies_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "low_level_ping_pong_benchmark", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "low_level_ping_pong_benchmark",
     "src": [
       "test/core/network_benchmarks/low_level_ping_pong.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "message_compress_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "message_compress_test",
     "src": [
       "test/core/compression/message_compress_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "mlog_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "mlog_test",
     "src": [
       "test/core/census/mlog_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "multiple_server_queues_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "multiple_server_queues_test",
     "src": [
       "test/core/end2end/multiple_server_queues_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
+      "gpr",
       "gpr_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "murmur_hash_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "murmur_hash_test",
     "src": [
       "test/core/support/murmur_hash_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "nanopb_fuzzer_response_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "nanopb_fuzzer_response_test",
     "src": [
       "test/core/nanopb/fuzzer_response.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "nanopb_fuzzer_serverlist_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "nanopb_fuzzer_serverlist_test",
     "src": [
       "test/core/nanopb/fuzzer_serverlist.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "no_server_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "no_server_test",
     "src": [
       "test/core/end2end/no_server_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "resolve_address_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "resolve_address_test",
     "src": [
       "test/core/iomgr/resolve_address_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "secure_channel_create_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "secure_channel_create_test",
     "src": [
       "test/core/surface/secure_channel_create_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "secure_endpoint_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "secure_endpoint_test",
     "src": [
       "test/core/security/secure_endpoint_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "server_chttp2_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "server_chttp2_test",
     "src": [
       "test/core/surface/server_chttp2_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "server_fuzzer", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "server_fuzzer",
     "src": [
       "test/core/end2end/fuzzers/server_fuzzer.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "server_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "server_test",
     "src": [
       "test/core/surface/server_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc_test_util", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
+      "grpc_test_util",
       "test_tcp_server"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "set_initial_connect_string_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "set_initial_connect_string_test",
     "src": [
       "test/core/client_config/set_initial_connect_string_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "sockaddr_resolver_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "sockaddr_resolver_test",
     "src": [
       "test/core/client_config/resolvers/sockaddr_resolver_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "sockaddr_utils_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "sockaddr_utils_test",
     "src": [
       "test/core/iomgr/sockaddr_utils_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "socket_utils_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "socket_utils_test",
     "src": [
       "test/core/iomgr/socket_utils_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "tcp_client_posix_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "tcp_client_posix_test",
     "src": [
       "test/core/iomgr/tcp_client_posix_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "tcp_posix_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "tcp_posix_test",
     "src": [
       "test/core/iomgr/tcp_posix_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "tcp_server_posix_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "tcp_server_posix_test",
     "src": [
       "test/core/iomgr/tcp_server_posix_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "time_averaged_stats_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "time_averaged_stats_test",
     "src": [
       "test/core/iomgr/time_averaged_stats_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "timeout_encoding_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "timeout_encoding_test",
     "src": [
       "test/core/transport/chttp2/timeout_encoding_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "timer_heap_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "timer_heap_test",
     "src": [
       "test/core/iomgr/timer_heap_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "timer_list_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "timer_list_test",
     "src": [
       "test/core/iomgr/timer_list_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "timers_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "timers_test",
     "src": [
       "test/core/profiling/timers_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "transport_connectivity_state_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "transport_connectivity_state_test",
     "src": [
       "test/core/transport/connectivity_state_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "transport_metadata_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "transport_metadata_test",
     "src": [
       "test/core/transport/metadata_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "transport_security_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "transport_security_test",
     "src": [
       "test/core/tsi/transport_security_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "udp_server_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "udp_server_test",
     "src": [
       "test/core/iomgr/udp_server_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "uri_fuzzer_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "uri_fuzzer_test",
     "src": [
       "test/core/client_config/uri_fuzzer_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "uri_parser_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "uri_parser_test",
     "src": [
       "test/core/client_config/uri_parser_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "workqueue_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "workqueue_test",
     "src": [
       "test/core/iomgr/workqueue_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc++", 
-      "grpc++_test_util", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
+      "grpc++",
+      "grpc++_test_util",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "alarm_cpp_test", 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "alarm_cpp_test",
     "src": [
       "test/cpp/common/alarm_cpp_test.cc"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc++", 
-      "grpc++_test_util", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
+      "grpc++",
+      "grpc++_test_util",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "async_end2end_test", 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "async_end2end_test",
     "src": [
       "test/cpp/end2end/async_end2end_test.cc"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc++", 
-      "grpc++_test_util", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
+      "grpc++",
+      "grpc++_test_util",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "auth_property_iterator_test", 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "auth_property_iterator_test",
     "src": [
       "test/cpp/common/auth_property_iterator_test.cc"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "grpc", 
+      "gpr",
+      "grpc",
       "grpc++"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "channel_arguments_test", 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "channel_arguments_test",
     "src": [
       "test/cpp/common/channel_arguments_test.cc"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc++", 
-      "grpc++_test_util", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
+      "grpc++",
+      "grpc++_test_util",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "cli_call_test", 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "cli_call_test",
     "src": [
       "test/cpp/util/cli_call_test.cc"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc++", 
-      "grpc++_test_util", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
+      "grpc++",
+      "grpc++_test_util",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "client_crash_test", 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "client_crash_test",
     "src": [
       "test/cpp/end2end/client_crash_test.cc"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc++", 
-      "grpc++_test_util", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
+      "grpc++",
+      "grpc++_test_util",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "client_crash_test_server", 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "client_crash_test_server",
     "src": [
       "test/cpp/end2end/client_crash_test_server.cc"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "grpc", 
-      "grpc++", 
+      "gpr",
+      "grpc",
+      "grpc++",
       "grpc++_codegen"
-    ], 
+    ],
     "headers": [
-      "src/proto/grpc/testing/control.grpc.pb.h", 
-      "src/proto/grpc/testing/control.pb.h", 
-      "src/proto/grpc/testing/messages.grpc.pb.h", 
-      "src/proto/grpc/testing/messages.pb.h", 
-      "src/proto/grpc/testing/payloads.grpc.pb.h", 
-      "src/proto/grpc/testing/payloads.pb.h", 
-      "src/proto/grpc/testing/perf_db.grpc.pb.h", 
-      "src/proto/grpc/testing/perf_db.pb.h", 
-      "src/proto/grpc/testing/services.grpc.pb.h", 
-      "src/proto/grpc/testing/services.pb.h", 
-      "src/proto/grpc/testing/stats.grpc.pb.h", 
+      "src/proto/grpc/testing/control.grpc.pb.h",
+      "src/proto/grpc/testing/control.pb.h",
+      "src/proto/grpc/testing/messages.grpc.pb.h",
+      "src/proto/grpc/testing/messages.pb.h",
+      "src/proto/grpc/testing/payloads.grpc.pb.h",
+      "src/proto/grpc/testing/payloads.pb.h",
+      "src/proto/grpc/testing/perf_db.grpc.pb.h",
+      "src/proto/grpc/testing/perf_db.pb.h",
+      "src/proto/grpc/testing/services.grpc.pb.h",
+      "src/proto/grpc/testing/services.pb.h",
+      "src/proto/grpc/testing/stats.grpc.pb.h",
       "src/proto/grpc/testing/stats.pb.h"
-    ], 
-    "language": "c++", 
-    "name": "codegen_test_full", 
+    ],
+    "language": "c++",
+    "name": "codegen_test_full",
     "src": [
       "test/cpp/codegen/codegen_test_full.cc"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
       "grpc++_codegen"
-    ], 
+    ],
     "headers": [
-      "src/proto/grpc/testing/control.grpc.pb.h", 
-      "src/proto/grpc/testing/control.pb.h", 
-      "src/proto/grpc/testing/messages.grpc.pb.h", 
-      "src/proto/grpc/testing/messages.pb.h", 
-      "src/proto/grpc/testing/payloads.grpc.pb.h", 
-      "src/proto/grpc/testing/payloads.pb.h", 
-      "src/proto/grpc/testing/perf_db.grpc.pb.h", 
-      "src/proto/grpc/testing/perf_db.pb.h", 
-      "src/proto/grpc/testing/services.grpc.pb.h", 
-      "src/proto/grpc/testing/services.pb.h", 
-      "src/proto/grpc/testing/stats.grpc.pb.h", 
+      "src/proto/grpc/testing/control.grpc.pb.h",
+      "src/proto/grpc/testing/control.pb.h",
+      "src/proto/grpc/testing/messages.grpc.pb.h",
+      "src/proto/grpc/testing/messages.pb.h",
+      "src/proto/grpc/testing/payloads.grpc.pb.h",
+      "src/proto/grpc/testing/payloads.pb.h",
+      "src/proto/grpc/testing/perf_db.grpc.pb.h",
+      "src/proto/grpc/testing/perf_db.pb.h",
+      "src/proto/grpc/testing/services.grpc.pb.h",
+      "src/proto/grpc/testing/services.pb.h",
+      "src/proto/grpc/testing/stats.grpc.pb.h",
       "src/proto/grpc/testing/stats.pb.h"
-    ], 
-    "language": "c++", 
-    "name": "codegen_test_minimal", 
+    ],
+    "language": "c++",
+    "name": "codegen_test_minimal",
     "src": [
       "test/cpp/codegen/codegen_test_minimal.cc"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "grpc", 
+      "gpr",
+      "grpc",
       "grpc++"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "credentials_test", 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "credentials_test",
     "src": [
       "test/cpp/client/credentials_test.cc"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc++", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
+      "grpc++",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "cxx_byte_buffer_test", 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "cxx_byte_buffer_test",
     "src": [
       "test/cpp/util/byte_buffer_test.cc"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc++", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
+      "grpc++",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "cxx_slice_test", 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "cxx_slice_test",
     "src": [
       "test/cpp/util/slice_test.cc"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
       "grpc++"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "cxx_string_ref_test", 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "cxx_string_ref_test",
     "src": [
       "test/cpp/util/string_ref_test.cc"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc++", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
+      "grpc++",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "cxx_time_test", 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "cxx_time_test",
     "src": [
       "test/cpp/util/time_test.cc"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc++", 
-      "grpc++_test_util", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
+      "grpc++",
+      "grpc++_test_util",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "end2end_test", 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "end2end_test",
     "src": [
       "test/cpp/end2end/end2end_test.cc"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc++", 
-      "grpc++_test_util", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
+      "grpc++",
+      "grpc++_test_util",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "generic_end2end_test", 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "generic_end2end_test",
     "src": [
       "test/cpp/end2end/generic_end2end_test.cc"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "grpc", 
+      "gpr",
+      "grpc",
       "grpc++"
-    ], 
+    ],
     "headers": [
-      "src/proto/grpc/testing/compiler_test.grpc.pb.h", 
+      "src/proto/grpc/testing/compiler_test.grpc.pb.h",
       "src/proto/grpc/testing/compiler_test.pb.h"
-    ], 
-    "language": "c++", 
-    "name": "golden_file_test", 
+    ],
+    "language": "c++",
+    "name": "golden_file_test",
     "src": [
       "test/cpp/codegen/golden_file_test.cc"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc++", 
-      "grpc++_test_config", 
-      "grpc++_test_util", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
+      "grpc++",
+      "grpc++_test_config",
+      "grpc++_test_util",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "grpc_cli", 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "grpc_cli",
     "src": [
       "test/cpp/util/grpc_cli.cc"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
       "grpc_plugin_support"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "grpc_cpp_plugin", 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "grpc_cpp_plugin",
     "src": [
       "src/compiler/cpp_plugin.cc"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
       "grpc_plugin_support"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "grpc_csharp_plugin", 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "grpc_csharp_plugin",
     "src": [
       "src/compiler/csharp_plugin.cc"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
       "grpc_plugin_support"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "grpc_node_plugin", 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "grpc_node_plugin",
     "src": [
       "src/compiler/node_plugin.cc"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
       "grpc_plugin_support"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "grpc_objective_c_plugin", 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "grpc_objective_c_plugin",
     "src": [
       "src/compiler/objective_c_plugin.cc"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
       "grpc_plugin_support"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "grpc_python_plugin", 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "grpc_python_plugin",
     "src": [
       "src/compiler/python_plugin.cc"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
       "grpc_plugin_support"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "grpc_ruby_plugin", 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "grpc_ruby_plugin",
     "src": [
       "src/compiler/ruby_plugin.cc"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "grpc", 
-      "grpc++", 
-      "grpc++_test_util", 
+      "grpc",
+      "grpc++",
+      "grpc++_test_util",
       "grpc_test_util"
-    ], 
+    ],
     "headers": [
-      "src/proto/grpc/lb/v1/load_balancer.grpc.pb.h", 
+      "src/proto/grpc/lb/v1/load_balancer.grpc.pb.h",
       "src/proto/grpc/lb/v1/load_balancer.pb.h"
-    ], 
-    "language": "c++", 
-    "name": "grpclb_api_test", 
+    ],
+    "language": "c++",
+    "name": "grpclb_api_test",
     "src": [
       "test/cpp/grpclb/grpclb_api_test.cc"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc++", 
-      "grpc++_test_util", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
+      "grpc++",
+      "grpc++_test_util",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "hybrid_end2end_test", 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "hybrid_end2end_test",
     "src": [
       "test/cpp/end2end/hybrid_end2end_test.cc"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc++", 
-      "grpc++_test_config", 
-      "grpc++_test_util", 
-      "grpc_test_util", 
-      "interop_client_helper", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
+      "grpc++",
+      "grpc++_test_config",
+      "grpc++_test_util",
+      "grpc_test_util",
+      "interop_client_helper",
       "interop_client_main"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "interop_client", 
-    "src": [], 
-    "third_party": false, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "interop_client",
+    "src": [],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc++", 
-      "grpc++_test_config", 
-      "grpc++_test_util", 
-      "grpc_test_util", 
-      "interop_server_helper", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
+      "grpc++",
+      "grpc++_test_config",
+      "grpc++_test_util",
+      "grpc_test_util",
+      "interop_server_helper",
       "interop_server_main"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "interop_server", 
-    "src": [], 
-    "third_party": false, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "interop_server",
+    "src": [],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "interop_test", 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "interop_test",
     "src": [
       "test/cpp/interop/interop_test.cc"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc++", 
-      "grpc++_test_config", 
-      "grpc++_test_util", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
+      "grpc++",
+      "grpc++_test_config",
+      "grpc++_test_util",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "json_run_localhost", 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "json_run_localhost",
     "src": [
       "test/cpp/qps/json_run_localhost.cc"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "grpc", 
-      "grpc++", 
+      "gpr",
+      "grpc",
+      "grpc++",
       "grpc++_test_config"
-    ], 
+    ],
     "headers": [
-      "src/proto/grpc/testing/metrics.grpc.pb.h", 
-      "src/proto/grpc/testing/metrics.pb.h", 
+      "src/proto/grpc/testing/metrics.grpc.pb.h",
+      "src/proto/grpc/testing/metrics.pb.h",
       "test/cpp/util/metrics_server.h"
-    ], 
-    "language": "c++", 
-    "name": "metrics_client", 
+    ],
+    "language": "c++",
+    "name": "metrics_client",
     "src": [
-      "test/cpp/interop/metrics_client.cc", 
+      "test/cpp/interop/metrics_client.cc",
       "test/cpp/util/metrics_server.h"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc++", 
-      "grpc++_test_util", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
+      "grpc++",
+      "grpc++_test_util",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "mock_test", 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "mock_test",
     "src": [
       "test/cpp/end2end/mock_test.cc"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc++", 
-      "grpc++_test_util", 
-      "grpc_test_util", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
+      "grpc++",
+      "grpc++_test_util",
+      "grpc_test_util",
       "qps"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "qps_interarrival_test", 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "qps_interarrival_test",
     "src": [
       "test/cpp/qps/qps_interarrival_test.cc"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc++", 
-      "grpc++_test_config", 
-      "grpc++_test_util", 
-      "grpc_test_util", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
+      "grpc++",
+      "grpc++_test_config",
+      "grpc++_test_util",
+      "grpc_test_util",
       "qps"
-    ], 
+    ],
     "headers": [
       "test/cpp/qps/parse_json.h"
-    ], 
-    "language": "c++", 
-    "name": "qps_json_driver", 
+    ],
+    "language": "c++",
+    "name": "qps_json_driver",
     "src": [
-      "test/cpp/qps/parse_json.cc", 
-      "test/cpp/qps/parse_json.h", 
+      "test/cpp/qps/parse_json.cc",
+      "test/cpp/qps/parse_json.h",
       "test/cpp/qps/qps_json_driver.cc"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc++", 
-      "grpc++_test_config", 
-      "grpc++_test_util", 
-      "grpc_test_util", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
+      "grpc++",
+      "grpc++_test_config",
+      "grpc++_test_util",
+      "grpc_test_util",
       "qps"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "qps_openloop_test", 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "qps_openloop_test",
     "src": [
       "test/cpp/qps/qps_openloop_test.cc"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc++", 
-      "grpc++_test_config", 
-      "grpc++_test_util", 
-      "grpc_test_util", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
+      "grpc++",
+      "grpc++_test_config",
+      "grpc++_test_util",
+      "grpc_test_util",
       "qps"
-    ], 
+    ],
     "headers": [
-      "test/cpp/qps/client.h", 
+      "test/cpp/qps/client.h",
       "test/cpp/qps/server.h"
-    ], 
-    "language": "c++", 
-    "name": "qps_worker", 
+    ],
+    "language": "c++",
+    "name": "qps_worker",
     "src": [
-      "test/cpp/qps/client.h", 
-      "test/cpp/qps/server.h", 
+      "test/cpp/qps/client.h",
+      "test/cpp/qps/server.h",
       "test/cpp/qps/worker.cc"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc++", 
-      "grpc++_test_config", 
-      "grpc++_test_util", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
+      "grpc++",
+      "grpc++_test_config",
+      "grpc++_test_util",
       "grpc_test_util"
-    ], 
+    ],
     "headers": [
-      "src/proto/grpc/testing/empty.grpc.pb.h", 
-      "src/proto/grpc/testing/empty.pb.h", 
-      "src/proto/grpc/testing/messages.grpc.pb.h", 
-      "src/proto/grpc/testing/messages.pb.h", 
-      "src/proto/grpc/testing/test.grpc.pb.h", 
+      "src/proto/grpc/testing/empty.grpc.pb.h",
+      "src/proto/grpc/testing/empty.pb.h",
+      "src/proto/grpc/testing/messages.grpc.pb.h",
+      "src/proto/grpc/testing/messages.pb.h",
+      "src/proto/grpc/testing/test.grpc.pb.h",
       "src/proto/grpc/testing/test.pb.h"
-    ], 
-    "language": "c++", 
-    "name": "reconnect_interop_client", 
+    ],
+    "language": "c++",
+    "name": "reconnect_interop_client",
     "src": [
       "test/cpp/interop/reconnect_interop_client.cc"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc++", 
-      "grpc++_test_config", 
-      "grpc++_test_util", 
-      "grpc_test_util", 
-      "reconnect_server", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
+      "grpc++",
+      "grpc++_test_config",
+      "grpc++_test_util",
+      "grpc_test_util",
+      "reconnect_server",
       "test_tcp_server"
-    ], 
+    ],
     "headers": [
-      "src/proto/grpc/testing/empty.grpc.pb.h", 
-      "src/proto/grpc/testing/empty.pb.h", 
-      "src/proto/grpc/testing/messages.grpc.pb.h", 
-      "src/proto/grpc/testing/messages.pb.h", 
-      "src/proto/grpc/testing/test.grpc.pb.h", 
+      "src/proto/grpc/testing/empty.grpc.pb.h",
+      "src/proto/grpc/testing/empty.pb.h",
+      "src/proto/grpc/testing/messages.grpc.pb.h",
+      "src/proto/grpc/testing/messages.pb.h",
+      "src/proto/grpc/testing/test.grpc.pb.h",
       "src/proto/grpc/testing/test.pb.h"
-    ], 
-    "language": "c++", 
-    "name": "reconnect_interop_server", 
+    ],
+    "language": "c++",
+    "name": "reconnect_interop_server",
     "src": [
       "test/cpp/interop/reconnect_interop_server.cc"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc++", 
-      "grpc++_test_util", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
+      "grpc++",
+      "grpc++_test_util",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "secure_auth_context_test", 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "secure_auth_context_test",
     "src": [
       "test/cpp/common/secure_auth_context_test.cc"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc++", 
-      "grpc++_test_util", 
-      "grpc_test_util", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
+      "grpc++",
+      "grpc++_test_util",
+      "grpc_test_util",
       "qps"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "secure_sync_unary_ping_pong_test", 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "secure_sync_unary_ping_pong_test",
     "src": [
       "test/cpp/qps/secure_sync_unary_ping_pong_test.cc"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc++", 
-      "grpc++_test_util", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
+      "grpc++",
+      "grpc++_test_util",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "server_builder_plugin_test", 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "server_builder_plugin_test",
     "src": [
       "test/cpp/end2end/server_builder_plugin_test.cc"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc++", 
-      "grpc++_test_util", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
+      "grpc++",
+      "grpc++_test_util",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "server_crash_test", 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "server_crash_test",
     "src": [
       "test/cpp/end2end/server_crash_test.cc"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc++", 
-      "grpc++_test_util", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
+      "grpc++",
+      "grpc++_test_util",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "server_crash_test_client", 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "server_crash_test_client",
     "src": [
       "test/cpp/end2end/server_crash_test_client.cc"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc++", 
-      "grpc++_test_util", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
+      "grpc++",
+      "grpc++_test_util",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "shutdown_test", 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "shutdown_test",
     "src": [
       "test/cpp/end2end/shutdown_test.cc"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc++", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
+      "grpc++",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "status_test", 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "status_test",
     "src": [
       "test/cpp/util/status_test.cc"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc++", 
-      "grpc++_test_util", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
+      "grpc++",
+      "grpc++_test_util",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "streaming_throughput_test", 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "streaming_throughput_test",
     "src": [
       "test/cpp/end2end/streaming_throughput_test.cc"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc++", 
-      "grpc++_test_config", 
-      "grpc++_test_util", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
+      "grpc++",
+      "grpc++_test_config",
+      "grpc++_test_util",
       "grpc_test_util"
-    ], 
+    ],
     "headers": [
-      "src/proto/grpc/testing/empty.grpc.pb.h", 
-      "src/proto/grpc/testing/empty.pb.h", 
-      "src/proto/grpc/testing/messages.grpc.pb.h", 
-      "src/proto/grpc/testing/messages.pb.h", 
-      "src/proto/grpc/testing/metrics.grpc.pb.h", 
-      "src/proto/grpc/testing/metrics.pb.h", 
-      "src/proto/grpc/testing/test.grpc.pb.h", 
-      "src/proto/grpc/testing/test.pb.h", 
-      "test/cpp/interop/client_helper.h", 
-      "test/cpp/interop/interop_client.h", 
-      "test/cpp/interop/stress_interop_client.h", 
+      "src/proto/grpc/testing/empty.grpc.pb.h",
+      "src/proto/grpc/testing/empty.pb.h",
+      "src/proto/grpc/testing/messages.grpc.pb.h",
+      "src/proto/grpc/testing/messages.pb.h",
+      "src/proto/grpc/testing/metrics.grpc.pb.h",
+      "src/proto/grpc/testing/metrics.pb.h",
+      "src/proto/grpc/testing/test.grpc.pb.h",
+      "src/proto/grpc/testing/test.pb.h",
+      "test/cpp/interop/client_helper.h",
+      "test/cpp/interop/interop_client.h",
+      "test/cpp/interop/stress_interop_client.h",
       "test/cpp/util/metrics_server.h"
-    ], 
-    "language": "c++", 
-    "name": "stress_test", 
+    ],
+    "language": "c++",
+    "name": "stress_test",
     "src": [
-      "test/cpp/interop/client_helper.h", 
-      "test/cpp/interop/interop_client.cc", 
-      "test/cpp/interop/interop_client.h", 
-      "test/cpp/interop/stress_interop_client.cc", 
-      "test/cpp/interop/stress_interop_client.h", 
-      "test/cpp/interop/stress_test.cc", 
-      "test/cpp/util/metrics_server.cc", 
+      "test/cpp/interop/client_helper.h",
+      "test/cpp/interop/interop_client.cc",
+      "test/cpp/interop/interop_client.h",
+      "test/cpp/interop/stress_interop_client.cc",
+      "test/cpp/interop/stress_interop_client.h",
+      "test/cpp/interop/stress_test.cc",
+      "test/cpp/util/metrics_server.cc",
       "test/cpp/util/metrics_server.h"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc++", 
-      "grpc++_test_util", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
+      "grpc++",
+      "grpc++_test_util",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "thread_stress_test", 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "thread_stress_test",
     "src": [
       "test/cpp/end2end/thread_stress_test.cc"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc++", 
-      "grpc++_test_util", 
-      "grpc_test_util", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
+      "grpc++",
+      "grpc++_test_util",
+      "grpc_test_util",
       "grpc_zookeeper"
-    ], 
+    ],
     "headers": [
-      "src/proto/grpc/testing/echo.grpc.pb.h", 
+      "src/proto/grpc/testing/echo.grpc.pb.h",
       "src/proto/grpc/testing/echo.pb.h"
-    ], 
-    "language": "c++", 
-    "name": "zookeeper_test", 
+    ],
+    "language": "c++",
+    "name": "zookeeper_test",
     "src": [
       "test/cpp/end2end/zookeeper_test.cc"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
+      "gpr",
       "grpc"
-    ], 
-    "headers": [], 
-    "language": "c89", 
-    "name": "public_headers_must_be_c89", 
+    ],
+    "headers": [],
+    "language": "c89",
+    "name": "public_headers_must_be_c89",
     "src": [
       "test/core/surface/public_headers_must_be_c89.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
-      "boringssl_aes_test_lib", 
+      "boringssl",
+      "boringssl_aes_test_lib",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_aes_test", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_aes_test",
+    "src": [],
+    "third_party": true,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
-      "boringssl_asn1_test_lib", 
+      "boringssl",
+      "boringssl_asn1_test_lib",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_asn1_test", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_asn1_test",
+    "src": [],
+    "third_party": true,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
-      "boringssl_base64_test_lib", 
+      "boringssl",
+      "boringssl_base64_test_lib",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_base64_test", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_base64_test",
+    "src": [],
+    "third_party": true,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
-      "boringssl_bio_test_lib", 
+      "boringssl",
+      "boringssl_bio_test_lib",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_bio_test", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_bio_test",
+    "src": [],
+    "third_party": true,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
-      "boringssl_bn_test_lib", 
+      "boringssl",
+      "boringssl_bn_test_lib",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_bn_test", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_bn_test",
+    "src": [],
+    "third_party": true,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
-      "boringssl_bytestring_test_lib", 
+      "boringssl",
+      "boringssl_bytestring_test_lib",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_bytestring_test", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_bytestring_test",
+    "src": [],
+    "third_party": true,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
-      "boringssl_aead_test_lib", 
+      "boringssl",
+      "boringssl_aead_test_lib",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_aead_test", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_aead_test",
+    "src": [],
+    "third_party": true,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
-      "boringssl_cipher_test_lib", 
+      "boringssl",
+      "boringssl_cipher_test_lib",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_cipher_test", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_cipher_test",
+    "src": [],
+    "third_party": true,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
-      "boringssl_cmac_test_lib", 
+      "boringssl",
+      "boringssl_cmac_test_lib",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_cmac_test", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_cmac_test",
+    "src": [],
+    "third_party": true,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
-      "boringssl_constant_time_test_lib", 
+      "boringssl",
+      "boringssl_constant_time_test_lib",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_constant_time_test", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_constant_time_test",
+    "src": [],
+    "third_party": true,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
-      "boringssl_ed25519_test_lib", 
+      "boringssl",
+      "boringssl_ed25519_test_lib",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_ed25519_test", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_ed25519_test",
+    "src": [],
+    "third_party": true,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
-      "boringssl_test_util", 
+      "boringssl",
+      "boringssl_test_util",
       "boringssl_x25519_test_lib"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_x25519_test", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_x25519_test",
+    "src": [],
+    "third_party": true,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
-      "boringssl_dh_test_lib", 
+      "boringssl",
+      "boringssl_dh_test_lib",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_dh_test", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_dh_test",
+    "src": [],
+    "third_party": true,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
-      "boringssl_digest_test_lib", 
+      "boringssl",
+      "boringssl_digest_test_lib",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_digest_test", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_digest_test",
+    "src": [],
+    "third_party": true,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
-      "boringssl_dsa_test_lib", 
+      "boringssl",
+      "boringssl_dsa_test_lib",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_dsa_test", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_dsa_test",
+    "src": [],
+    "third_party": true,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
-      "boringssl_ec_test_lib", 
+      "boringssl",
+      "boringssl_ec_test_lib",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_ec_test", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_ec_test",
+    "src": [],
+    "third_party": true,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
-      "boringssl_example_mul_lib", 
+      "boringssl",
+      "boringssl_example_mul_lib",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_example_mul", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_example_mul",
+    "src": [],
+    "third_party": true,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
-      "boringssl_ecdsa_test_lib", 
+      "boringssl",
+      "boringssl_ecdsa_test_lib",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_ecdsa_test", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_ecdsa_test",
+    "src": [],
+    "third_party": true,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
-      "boringssl_err_test_lib", 
+      "boringssl",
+      "boringssl_err_test_lib",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_err_test", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_err_test",
+    "src": [],
+    "third_party": true,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
-      "boringssl_evp_extra_test_lib", 
+      "boringssl",
+      "boringssl_evp_extra_test_lib",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_evp_extra_test", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_evp_extra_test",
+    "src": [],
+    "third_party": true,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
-      "boringssl_evp_test_lib", 
+      "boringssl",
+      "boringssl_evp_test_lib",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_evp_test", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_evp_test",
+    "src": [],
+    "third_party": true,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
-      "boringssl_pbkdf_test_lib", 
+      "boringssl",
+      "boringssl_pbkdf_test_lib",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_pbkdf_test", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_pbkdf_test",
+    "src": [],
+    "third_party": true,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
-      "boringssl_hkdf_test_lib", 
+      "boringssl",
+      "boringssl_hkdf_test_lib",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_hkdf_test", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_hkdf_test",
+    "src": [],
+    "third_party": true,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
-      "boringssl_hmac_test_lib", 
+      "boringssl",
+      "boringssl_hmac_test_lib",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_hmac_test", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_hmac_test",
+    "src": [],
+    "third_party": true,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
-      "boringssl_lhash_test_lib", 
+      "boringssl",
+      "boringssl_lhash_test_lib",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_lhash_test", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_lhash_test",
+    "src": [],
+    "third_party": true,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
-      "boringssl_gcm_test_lib", 
+      "boringssl",
+      "boringssl_gcm_test_lib",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_gcm_test", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_gcm_test",
+    "src": [],
+    "third_party": true,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
-      "boringssl_pkcs12_test_lib", 
+      "boringssl",
+      "boringssl_pkcs12_test_lib",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_pkcs12_test", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_pkcs12_test",
+    "src": [],
+    "third_party": true,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
-      "boringssl_pkcs8_test_lib", 
+      "boringssl",
+      "boringssl_pkcs8_test_lib",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_pkcs8_test", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_pkcs8_test",
+    "src": [],
+    "third_party": true,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
-      "boringssl_poly1305_test_lib", 
+      "boringssl",
+      "boringssl_poly1305_test_lib",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_poly1305_test", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_poly1305_test",
+    "src": [],
+    "third_party": true,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
-      "boringssl_refcount_test_lib", 
+      "boringssl",
+      "boringssl_refcount_test_lib",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_refcount_test", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_refcount_test",
+    "src": [],
+    "third_party": true,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
-      "boringssl_rsa_test_lib", 
+      "boringssl",
+      "boringssl_rsa_test_lib",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_rsa_test", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_rsa_test",
+    "src": [],
+    "third_party": true,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
-      "boringssl_test_util", 
+      "boringssl",
+      "boringssl_test_util",
       "boringssl_thread_test_lib"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_thread_test", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_thread_test",
+    "src": [],
+    "third_party": true,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
-      "boringssl_pkcs7_test_lib", 
+      "boringssl",
+      "boringssl_pkcs7_test_lib",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_pkcs7_test", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_pkcs7_test",
+    "src": [],
+    "third_party": true,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
-      "boringssl_test_util", 
+      "boringssl",
+      "boringssl_test_util",
       "boringssl_x509_test_lib"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_x509_test", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_x509_test",
+    "src": [],
+    "third_party": true,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
-      "boringssl_tab_test_lib", 
+      "boringssl",
+      "boringssl_tab_test_lib",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_tab_test", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_tab_test",
+    "src": [],
+    "third_party": true,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
-      "boringssl_test_util", 
+      "boringssl",
+      "boringssl_test_util",
       "boringssl_v3name_test_lib"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_v3name_test", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_v3name_test",
+    "src": [],
+    "third_party": true,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
-      "boringssl_pqueue_test_lib", 
+      "boringssl",
+      "boringssl_pqueue_test_lib",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_pqueue_test", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_pqueue_test",
+    "src": [],
+    "third_party": true,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
-      "boringssl_ssl_test_lib", 
+      "boringssl",
+      "boringssl_ssl_test_lib",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_ssl_test", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_ssl_test",
+    "src": [],
+    "third_party": true,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "bad_client_test", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc_test_util_unsecure", 
+      "bad_client_test",
+      "gpr",
+      "gpr_test_util",
+      "grpc_test_util_unsecure",
       "grpc_unsecure"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "badreq_bad_client_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "badreq_bad_client_test",
     "src": [
       "test/core/bad_client/tests/badreq.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "bad_client_test", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc_test_util_unsecure", 
+      "bad_client_test",
+      "gpr",
+      "gpr_test_util",
+      "grpc_test_util_unsecure",
       "grpc_unsecure"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "connection_prefix_bad_client_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "connection_prefix_bad_client_test",
     "src": [
       "test/core/bad_client/tests/connection_prefix.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "bad_client_test", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc_test_util_unsecure", 
+      "bad_client_test",
+      "gpr",
+      "gpr_test_util",
+      "grpc_test_util_unsecure",
       "grpc_unsecure"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "head_of_line_blocking_bad_client_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "head_of_line_blocking_bad_client_test",
     "src": [
       "test/core/bad_client/tests/head_of_line_blocking.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "bad_client_test", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc_test_util_unsecure", 
+      "bad_client_test",
+      "gpr",
+      "gpr_test_util",
+      "grpc_test_util_unsecure",
       "grpc_unsecure"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "headers_bad_client_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "headers_bad_client_test",
     "src": [
       "test/core/bad_client/tests/headers.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "bad_client_test", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc_test_util_unsecure", 
+      "bad_client_test",
+      "gpr",
+      "gpr_test_util",
+      "grpc_test_util_unsecure",
       "grpc_unsecure"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "initial_settings_frame_bad_client_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "initial_settings_frame_bad_client_test",
     "src": [
       "test/core/bad_client/tests/initial_settings_frame.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "bad_client_test", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc_test_util_unsecure", 
+      "bad_client_test",
+      "gpr",
+      "gpr_test_util",
+      "grpc_test_util_unsecure",
       "grpc_unsecure"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "large_metadata_bad_client_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "large_metadata_bad_client_test",
     "src": [
       "test/core/bad_client/tests/large_metadata.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "bad_client_test", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc_test_util_unsecure", 
+      "bad_client_test",
+      "gpr",
+      "gpr_test_util",
+      "grpc_test_util_unsecure",
       "grpc_unsecure"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "server_registered_method_bad_client_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "server_registered_method_bad_client_test",
     "src": [
       "test/core/bad_client/tests/server_registered_method.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "bad_client_test", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc_test_util_unsecure", 
+      "bad_client_test",
+      "gpr",
+      "gpr_test_util",
+      "grpc_test_util_unsecure",
       "grpc_unsecure"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "simple_request_bad_client_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "simple_request_bad_client_test",
     "src": [
       "test/core/bad_client/tests/simple_request.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "bad_client_test", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc_test_util_unsecure", 
+      "bad_client_test",
+      "gpr",
+      "gpr_test_util",
+      "grpc_test_util_unsecure",
       "grpc_unsecure"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "unknown_frame_bad_client_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "unknown_frame_bad_client_test",
     "src": [
       "test/core/bad_client/tests/unknown_frame.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "bad_client_test", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc_test_util_unsecure", 
+      "bad_client_test",
+      "gpr",
+      "gpr_test_util",
+      "grpc_test_util_unsecure",
       "grpc_unsecure"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "window_overflow_bad_client_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "window_overflow_bad_client_test",
     "src": [
       "test/core/bad_client/tests/window_overflow.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "bad_ssl_test_server", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "bad_ssl_test_server",
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "bad_ssl_alpn_server", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "bad_ssl_alpn_server",
     "src": [
       "test/core/bad_ssl/servers/alpn.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "bad_ssl_test_server", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "bad_ssl_test_server",
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "bad_ssl_cert_server", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "bad_ssl_cert_server",
     "src": [
       "test/core/bad_ssl/servers/cert.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "bad_ssl_alpn_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "bad_ssl_alpn_test",
     "src": [
       "test/core/bad_ssl/bad_ssl_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "bad_ssl_cert_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "bad_ssl_cert_test",
     "src": [
       "test/core/bad_ssl/bad_ssl_test.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "end2end_tests", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "end2end_tests",
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "h2_census_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "h2_census_test",
     "src": [
       "test/core/end2end/fixtures/h2_census.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "end2end_tests", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "end2end_tests",
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "h2_compress_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "h2_compress_test",
     "src": [
       "test/core/end2end/fixtures/h2_compress.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "end2end_tests", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "end2end_tests",
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "h2_fakesec_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "h2_fakesec_test",
     "src": [
       "test/core/end2end/fixtures/h2_fakesec.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "end2end_tests", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "end2end_tests",
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "h2_full_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "h2_full_test",
     "src": [
       "test/core/end2end/fixtures/h2_full.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "end2end_tests", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "end2end_tests",
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "h2_full+pipe_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "h2_full+pipe_test",
     "src": [
       "test/core/end2end/fixtures/h2_full+pipe.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "end2end_tests", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "end2end_tests",
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "h2_full+trace_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "h2_full+trace_test",
     "src": [
       "test/core/end2end/fixtures/h2_full+trace.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "end2end_tests", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "end2end_tests",
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "h2_oauth2_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "h2_oauth2_test",
     "src": [
       "test/core/end2end/fixtures/h2_oauth2.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "end2end_tests", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "end2end_tests",
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "h2_proxy_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "h2_proxy_test",
     "src": [
       "test/core/end2end/fixtures/h2_proxy.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "end2end_tests", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "end2end_tests",
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "h2_sockpair_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "h2_sockpair_test",
     "src": [
       "test/core/end2end/fixtures/h2_sockpair.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "end2end_tests", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "end2end_tests",
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "h2_sockpair+trace_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "h2_sockpair+trace_test",
     "src": [
       "test/core/end2end/fixtures/h2_sockpair+trace.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "end2end_tests", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "end2end_tests",
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "h2_sockpair_1byte_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "h2_sockpair_1byte_test",
     "src": [
       "test/core/end2end/fixtures/h2_sockpair_1byte.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "end2end_tests", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "end2end_tests",
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "h2_ssl_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "h2_ssl_test",
     "src": [
       "test/core/end2end/fixtures/h2_ssl.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "end2end_tests", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "end2end_tests",
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "h2_ssl_cert_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "h2_ssl_cert_test",
     "src": [
       "test/core/end2end/fixtures/h2_ssl_cert.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "end2end_tests", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "end2end_tests",
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "h2_ssl_proxy_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "h2_ssl_proxy_test",
     "src": [
       "test/core/end2end/fixtures/h2_ssl_proxy.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "end2end_tests", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "end2end_tests",
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "h2_uds_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "h2_uds_test",
     "src": [
       "test/core/end2end/fixtures/h2_uds.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "end2end_nosec_tests", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc_test_util_unsecure", 
+      "end2end_nosec_tests",
+      "gpr",
+      "gpr_test_util",
+      "grpc_test_util_unsecure",
       "grpc_unsecure"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "h2_census_nosec_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "h2_census_nosec_test",
     "src": [
       "test/core/end2end/fixtures/h2_census.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "end2end_nosec_tests", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc_test_util_unsecure", 
+      "end2end_nosec_tests",
+      "gpr",
+      "gpr_test_util",
+      "grpc_test_util_unsecure",
       "grpc_unsecure"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "h2_compress_nosec_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "h2_compress_nosec_test",
     "src": [
       "test/core/end2end/fixtures/h2_compress.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "end2end_nosec_tests", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc_test_util_unsecure", 
+      "end2end_nosec_tests",
+      "gpr",
+      "gpr_test_util",
+      "grpc_test_util_unsecure",
       "grpc_unsecure"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "h2_full_nosec_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "h2_full_nosec_test",
     "src": [
       "test/core/end2end/fixtures/h2_full.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "end2end_nosec_tests", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc_test_util_unsecure", 
+      "end2end_nosec_tests",
+      "gpr",
+      "gpr_test_util",
+      "grpc_test_util_unsecure",
       "grpc_unsecure"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "h2_full+pipe_nosec_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "h2_full+pipe_nosec_test",
     "src": [
       "test/core/end2end/fixtures/h2_full+pipe.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "end2end_nosec_tests", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc_test_util_unsecure", 
+      "end2end_nosec_tests",
+      "gpr",
+      "gpr_test_util",
+      "grpc_test_util_unsecure",
       "grpc_unsecure"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "h2_full+trace_nosec_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "h2_full+trace_nosec_test",
     "src": [
       "test/core/end2end/fixtures/h2_full+trace.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "end2end_nosec_tests", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc_test_util_unsecure", 
+      "end2end_nosec_tests",
+      "gpr",
+      "gpr_test_util",
+      "grpc_test_util_unsecure",
       "grpc_unsecure"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "h2_proxy_nosec_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "h2_proxy_nosec_test",
     "src": [
       "test/core/end2end/fixtures/h2_proxy.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "end2end_nosec_tests", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc_test_util_unsecure", 
+      "end2end_nosec_tests",
+      "gpr",
+      "gpr_test_util",
+      "grpc_test_util_unsecure",
       "grpc_unsecure"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "h2_sockpair_nosec_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "h2_sockpair_nosec_test",
     "src": [
       "test/core/end2end/fixtures/h2_sockpair.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "end2end_nosec_tests", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc_test_util_unsecure", 
+      "end2end_nosec_tests",
+      "gpr",
+      "gpr_test_util",
+      "grpc_test_util_unsecure",
       "grpc_unsecure"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "h2_sockpair+trace_nosec_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "h2_sockpair+trace_nosec_test",
     "src": [
       "test/core/end2end/fixtures/h2_sockpair+trace.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "end2end_nosec_tests", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc_test_util_unsecure", 
+      "end2end_nosec_tests",
+      "gpr",
+      "gpr_test_util",
+      "grpc_test_util_unsecure",
       "grpc_unsecure"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "h2_sockpair_1byte_nosec_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "h2_sockpair_1byte_nosec_test",
     "src": [
       "test/core/end2end/fixtures/h2_sockpair_1byte.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "end2end_nosec_tests", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc_test_util_unsecure", 
+      "end2end_nosec_tests",
+      "gpr",
+      "gpr_test_util",
+      "grpc_test_util_unsecure",
       "grpc_unsecure"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "h2_uds_nosec_test", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "h2_uds_nosec_test",
     "src": [
       "test/core/end2end/fixtures/h2_uds.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "api_fuzzer_one_entry", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "api_fuzzer_one_entry",
     "src": [
-      "test/core/end2end/fuzzers/api_fuzzer.c", 
+      "test/core/end2end/fuzzers/api_fuzzer.c",
       "test/core/util/one_corpus_entry_fuzzer.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "client_fuzzer_one_entry", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "client_fuzzer_one_entry",
     "src": [
-      "test/core/end2end/fuzzers/client_fuzzer.c", 
+      "test/core/end2end/fuzzers/client_fuzzer.c",
       "test/core/util/one_corpus_entry_fuzzer.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "hpack_parser_fuzzer_test_one_entry", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "hpack_parser_fuzzer_test_one_entry",
     "src": [
-      "test/core/transport/chttp2/hpack_parser_fuzzer_test.c", 
+      "test/core/transport/chttp2/hpack_parser_fuzzer_test.c",
       "test/core/util/one_corpus_entry_fuzzer.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "http_fuzzer_test_one_entry", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "http_fuzzer_test_one_entry",
     "src": [
-      "test/core/http/fuzzer.c", 
+      "test/core/http/fuzzer.c",
       "test/core/util/one_corpus_entry_fuzzer.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "json_fuzzer_test_one_entry", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "json_fuzzer_test_one_entry",
     "src": [
-      "test/core/json/fuzzer.c", 
+      "test/core/json/fuzzer.c",
       "test/core/util/one_corpus_entry_fuzzer.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "nanopb_fuzzer_response_test_one_entry", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "nanopb_fuzzer_response_test_one_entry",
     "src": [
-      "test/core/nanopb/fuzzer_response.c", 
+      "test/core/nanopb/fuzzer_response.c",
       "test/core/util/one_corpus_entry_fuzzer.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "nanopb_fuzzer_serverlist_test_one_entry", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "nanopb_fuzzer_serverlist_test_one_entry",
     "src": [
-      "test/core/nanopb/fuzzer_serverlist.c", 
+      "test/core/nanopb/fuzzer_serverlist.c",
       "test/core/util/one_corpus_entry_fuzzer.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "server_fuzzer_one_entry", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "server_fuzzer_one_entry",
     "src": [
-      "test/core/end2end/fuzzers/server_fuzzer.c", 
+      "test/core/end2end/fuzzers/server_fuzzer.c",
       "test/core/util/one_corpus_entry_fuzzer.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "uri_fuzzer_test_one_entry", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "uri_fuzzer_test_one_entry",
     "src": [
-      "test/core/client_config/uri_fuzzer_test.c", 
+      "test/core/client_config/uri_fuzzer_test.c",
       "test/core/util/one_corpus_entry_fuzzer.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "target"
-  }, 
+  },
   {
     "deps": [
       "gpr_base"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "gpr", 
-    "src": [], 
-    "third_party": false, 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "gpr",
+    "src": [],
+    "third_party": false,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
       "gpr"
-    ], 
+    ],
     "headers": [
       "test/core/util/test_config.h"
-    ], 
-    "language": "c", 
-    "name": "gpr_test_util", 
+    ],
+    "language": "c",
+    "name": "gpr_test_util",
     "src": [
-      "test/core/util/test_config.c", 
+      "test/core/util/test_config.c",
       "test/core/util/test_config.h"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "census", 
-      "gpr", 
-      "grpc_base", 
-      "grpc_lb_policy_grpclb", 
-      "grpc_lb_policy_pick_first", 
-      "grpc_lb_policy_round_robin", 
-      "grpc_resolver_dns_native", 
-      "grpc_resolver_sockaddr", 
-      "grpc_secure", 
-      "grpc_transport_chttp2_client_insecure", 
-      "grpc_transport_chttp2_client_secure", 
-      "grpc_transport_chttp2_server_insecure", 
-      "grpc_transport_chttp2_server_secure", 
+      "census",
+      "gpr",
+      "grpc_base",
+      "grpc_lb_policy_grpclb",
+      "grpc_lb_policy_pick_first",
+      "grpc_lb_policy_round_robin",
+      "grpc_resolver_dns_native",
+      "grpc_resolver_sockaddr",
+      "grpc_secure",
+      "grpc_transport_chttp2_client_insecure",
+      "grpc_transport_chttp2_client_secure",
+      "grpc_transport_chttp2_server_insecure",
+      "grpc_transport_chttp2_server_secure",
       "grpc_transport_cronet_client_secure"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "grpc", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "grpc",
     "src": [
       "src/core/lib/surface/init.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
+      "gpr",
       "grpc"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "grpc_dll", 
-    "src": [], 
-    "third_party": false, 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "grpc_dll",
+    "src": [],
+    "third_party": false,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util_base"
-    ], 
+    ],
     "headers": [
-      "test/core/end2end/data/ssl_test_data.h", 
+      "test/core/end2end/data/ssl_test_data.h",
       "test/core/security/oauth2_utils.h"
-    ], 
-    "language": "c", 
-    "name": "grpc_test_util", 
+    ],
+    "language": "c",
+    "name": "grpc_test_util",
     "src": [
-      "test/core/end2end/data/client_certs.c", 
-      "test/core/end2end/data/server1_cert.c", 
-      "test/core/end2end/data/server1_key.c", 
-      "test/core/end2end/data/ssl_test_data.h", 
-      "test/core/end2end/data/test_root_cert.c", 
-      "test/core/security/oauth2_utils.c", 
+      "test/core/end2end/data/client_certs.c",
+      "test/core/end2end/data/server1_cert.c",
+      "test/core/end2end/data/server1_key.c",
+      "test/core/end2end/data/ssl_test_data.h",
+      "test/core/end2end/data/test_root_cert.c",
+      "test/core/security/oauth2_utils.c",
       "test/core/security/oauth2_utils.h"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc_test_util_base", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
+      "grpc_test_util_base",
       "grpc_unsecure"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "grpc_test_util_unsecure", 
-    "src": [], 
-    "third_party": false, 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "grpc_test_util_unsecure",
+    "src": [],
+    "third_party": false,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "census", 
-      "gpr", 
-      "grpc_base", 
-      "grpc_lb_policy_grpclb", 
-      "grpc_lb_policy_pick_first", 
-      "grpc_lb_policy_round_robin", 
-      "grpc_resolver_dns_native", 
-      "grpc_resolver_sockaddr", 
-      "grpc_transport_chttp2_client_insecure", 
+      "census",
+      "gpr",
+      "grpc_base",
+      "grpc_lb_policy_grpclb",
+      "grpc_lb_policy_pick_first",
+      "grpc_lb_policy_round_robin",
+      "grpc_resolver_dns_native",
+      "grpc_resolver_sockaddr",
+      "grpc_transport_chttp2_client_insecure",
       "grpc_transport_chttp2_server_insecure"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "grpc_unsecure", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "grpc_unsecure",
     "src": [
-      "src/core/lib/surface/init.c", 
+      "src/core/lib/surface/init.c",
       "src/core/lib/surface/init_unsecure.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
+      "gpr",
       "grpc"
-    ], 
+    ],
     "headers": [
       "include/grpc/grpc_zookeeper.h"
-    ], 
-    "language": "c", 
-    "name": "grpc_zookeeper", 
+    ],
+    "language": "c",
+    "name": "grpc_zookeeper",
     "src": [
-      "include/grpc/grpc_zookeeper.h", 
+      "include/grpc/grpc_zookeeper.h",
       "src/core/ext/resolver/zookeeper/zookeeper_resolver.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc_test_util", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
+      "grpc_test_util",
       "test_tcp_server"
-    ], 
+    ],
     "headers": [
       "test/core/util/reconnect_server.h"
-    ], 
-    "language": "c", 
-    "name": "reconnect_server", 
+    ],
+    "language": "c",
+    "name": "reconnect_server",
     "src": [
-      "test/core/util/reconnect_server.c", 
+      "test/core/util/reconnect_server.c",
       "test/core/util/reconnect_server.h"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
+    ],
     "headers": [
       "test/core/util/test_tcp_server.h"
-    ], 
-    "language": "c", 
-    "name": "test_tcp_server", 
+    ],
+    "language": "c",
+    "name": "test_tcp_server",
     "src": [
-      "test/core/util/test_tcp_server.c", 
+      "test/core/util/test_tcp_server.c",
       "test/core/util/test_tcp_server.h"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "grpc", 
-      "grpc++_base", 
+      "grpc",
+      "grpc++_base",
       "grpc++_codegen"
-    ], 
+    ],
     "headers": [
-      "src/cpp/client/secure_credentials.h", 
-      "src/cpp/common/core_codegen.h", 
-      "src/cpp/common/secure_auth_context.h", 
+      "src/cpp/client/secure_credentials.h",
+      "src/cpp/common/core_codegen.h",
+      "src/cpp/common/secure_auth_context.h",
       "src/cpp/server/secure_server_credentials.h"
-    ], 
-    "language": "c++", 
-    "name": "grpc++", 
+    ],
+    "language": "c++",
+    "name": "grpc++",
     "src": [
-      "src/cpp/client/secure_credentials.cc", 
-      "src/cpp/client/secure_credentials.h", 
-      "src/cpp/common/auth_property_iterator.cc", 
-      "src/cpp/common/core_codegen.h", 
-      "src/cpp/common/secure_auth_context.cc", 
-      "src/cpp/common/secure_auth_context.h", 
-      "src/cpp/common/secure_channel_arguments.cc", 
-      "src/cpp/common/secure_create_auth_context.cc", 
-      "src/cpp/server/secure_server_credentials.cc", 
+      "src/cpp/client/secure_credentials.cc",
+      "src/cpp/client/secure_credentials.h",
+      "src/cpp/common/auth_property_iterator.cc",
+      "src/cpp/common/core_codegen.h",
+      "src/cpp/common/secure_auth_context.cc",
+      "src/cpp/common/secure_auth_context.h",
+      "src/cpp/common/secure_channel_arguments.cc",
+      "src/cpp/common/secure_create_auth_context.cc",
+      "src/cpp/server/secure_server_credentials.cc",
       "src/cpp/server/secure_server_credentials.h"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "lib"
-  }, 
+  },
   {
-    "deps": [], 
+    "deps": [],
     "headers": [
       "test/cpp/util/test_config.h"
-    ], 
-    "language": "c++", 
-    "name": "grpc++_test_config", 
+    ],
+    "language": "c++",
+    "name": "grpc++_test_config",
     "src": [
-      "test/cpp/util/test_config.cc", 
+      "test/cpp/util/test_config.cc",
       "test/cpp/util/test_config.h"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "grpc++", 
+      "grpc++",
       "grpc_test_util"
-    ], 
+    ],
     "headers": [
-      "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h", 
-      "src/proto/grpc/testing/duplicate/echo_duplicate.pb.h", 
-      "src/proto/grpc/testing/echo.grpc.pb.h", 
-      "src/proto/grpc/testing/echo.pb.h", 
-      "src/proto/grpc/testing/echo_messages.grpc.pb.h", 
-      "src/proto/grpc/testing/echo_messages.pb.h", 
-      "test/cpp/end2end/test_service_impl.h", 
-      "test/cpp/util/byte_buffer_proto_helper.h", 
-      "test/cpp/util/cli_call.h", 
-      "test/cpp/util/create_test_channel.h", 
-      "test/cpp/util/string_ref_helper.h", 
-      "test/cpp/util/subprocess.h", 
+      "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h",
+      "src/proto/grpc/testing/duplicate/echo_duplicate.pb.h",
+      "src/proto/grpc/testing/echo.grpc.pb.h",
+      "src/proto/grpc/testing/echo.pb.h",
+      "src/proto/grpc/testing/echo_messages.grpc.pb.h",
+      "src/proto/grpc/testing/echo_messages.pb.h",
+      "test/cpp/end2end/test_service_impl.h",
+      "test/cpp/util/byte_buffer_proto_helper.h",
+      "test/cpp/util/cli_call.h",
+      "test/cpp/util/create_test_channel.h",
+      "test/cpp/util/string_ref_helper.h",
+      "test/cpp/util/subprocess.h",
       "test/cpp/util/test_credentials_provider.h"
-    ], 
-    "language": "c++", 
-    "name": "grpc++_test_util", 
+    ],
+    "language": "c++",
+    "name": "grpc++_test_util",
     "src": [
-      "test/cpp/end2end/test_service_impl.cc", 
-      "test/cpp/end2end/test_service_impl.h", 
-      "test/cpp/util/byte_buffer_proto_helper.cc", 
-      "test/cpp/util/byte_buffer_proto_helper.h", 
-      "test/cpp/util/cli_call.cc", 
-      "test/cpp/util/cli_call.h", 
-      "test/cpp/util/create_test_channel.cc", 
-      "test/cpp/util/create_test_channel.h", 
-      "test/cpp/util/string_ref_helper.cc", 
-      "test/cpp/util/string_ref_helper.h", 
-      "test/cpp/util/subprocess.cc", 
-      "test/cpp/util/subprocess.h", 
-      "test/cpp/util/test_credentials_provider.cc", 
+      "test/cpp/end2end/test_service_impl.cc",
+      "test/cpp/end2end/test_service_impl.h",
+      "test/cpp/util/byte_buffer_proto_helper.cc",
+      "test/cpp/util/byte_buffer_proto_helper.h",
+      "test/cpp/util/cli_call.cc",
+      "test/cpp/util/cli_call.h",
+      "test/cpp/util/create_test_channel.cc",
+      "test/cpp/util/create_test_channel.h",
+      "test/cpp/util/string_ref_helper.cc",
+      "test/cpp/util/string_ref_helper.h",
+      "test/cpp/util/subprocess.cc",
+      "test/cpp/util/subprocess.h",
+      "test/cpp/util/test_credentials_provider.cc",
       "test/cpp/util/test_credentials_provider.h"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "grpc", 
-      "grpc++_base", 
-      "grpc++_codegen", 
+      "gpr",
+      "grpc",
+      "grpc++_base",
+      "grpc++_codegen",
       "grpc_unsecure"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "grpc++_unsecure", 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "grpc++_unsecure",
     "src": [
       "src/cpp/common/insecure_create_auth_context.cc"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
       "grpc++_config"
-    ], 
+    ],
     "headers": [
-      "src/compiler/config.h", 
-      "src/compiler/cpp_generator.h", 
-      "src/compiler/cpp_generator_helpers.h", 
-      "src/compiler/csharp_generator.h", 
-      "src/compiler/csharp_generator_helpers.h", 
-      "src/compiler/generator_helpers.h", 
-      "src/compiler/node_generator.h", 
-      "src/compiler/node_generator_helpers.h", 
-      "src/compiler/objective_c_generator.h", 
-      "src/compiler/objective_c_generator_helpers.h", 
-      "src/compiler/python_generator.h", 
-      "src/compiler/ruby_generator.h", 
-      "src/compiler/ruby_generator_helpers-inl.h", 
-      "src/compiler/ruby_generator_map-inl.h", 
+      "src/compiler/config.h",
+      "src/compiler/cpp_generator.h",
+      "src/compiler/cpp_generator_helpers.h",
+      "src/compiler/csharp_generator.h",
+      "src/compiler/csharp_generator_helpers.h",
+      "src/compiler/generator_helpers.h",
+      "src/compiler/node_generator.h",
+      "src/compiler/node_generator_helpers.h",
+      "src/compiler/objective_c_generator.h",
+      "src/compiler/objective_c_generator_helpers.h",
+      "src/compiler/python_generator.h",
+      "src/compiler/ruby_generator.h",
+      "src/compiler/ruby_generator_helpers-inl.h",
+      "src/compiler/ruby_generator_map-inl.h",
       "src/compiler/ruby_generator_string-inl.h"
-    ], 
-    "language": "c++", 
-    "name": "grpc_plugin_support", 
+    ],
+    "language": "c++",
+    "name": "grpc_plugin_support",
     "src": [
-      "src/compiler/config.h", 
-      "src/compiler/cpp_generator.cc", 
-      "src/compiler/cpp_generator.h", 
-      "src/compiler/cpp_generator_helpers.h", 
-      "src/compiler/csharp_generator.cc", 
-      "src/compiler/csharp_generator.h", 
-      "src/compiler/csharp_generator_helpers.h", 
-      "src/compiler/generator_helpers.h", 
-      "src/compiler/node_generator.cc", 
-      "src/compiler/node_generator.h", 
-      "src/compiler/node_generator_helpers.h", 
-      "src/compiler/objective_c_generator.cc", 
-      "src/compiler/objective_c_generator.h", 
-      "src/compiler/objective_c_generator_helpers.h", 
-      "src/compiler/python_generator.cc", 
-      "src/compiler/python_generator.h", 
-      "src/compiler/ruby_generator.cc", 
-      "src/compiler/ruby_generator.h", 
-      "src/compiler/ruby_generator_helpers-inl.h", 
-      "src/compiler/ruby_generator_map-inl.h", 
+      "src/compiler/config.h",
+      "src/compiler/cpp_generator.cc",
+      "src/compiler/cpp_generator.h",
+      "src/compiler/cpp_generator_helpers.h",
+      "src/compiler/csharp_generator.cc",
+      "src/compiler/csharp_generator.h",
+      "src/compiler/csharp_generator_helpers.h",
+      "src/compiler/generator_helpers.h",
+      "src/compiler/node_generator.cc",
+      "src/compiler/node_generator.h",
+      "src/compiler/node_generator_helpers.h",
+      "src/compiler/objective_c_generator.cc",
+      "src/compiler/objective_c_generator.h",
+      "src/compiler/objective_c_generator_helpers.h",
+      "src/compiler/python_generator.cc",
+      "src/compiler/python_generator.h",
+      "src/compiler/ruby_generator.cc",
+      "src/compiler/ruby_generator.h",
+      "src/compiler/ruby_generator_helpers-inl.h",
+      "src/compiler/ruby_generator_map-inl.h",
       "src/compiler/ruby_generator_string-inl.h"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "grpc", 
-      "grpc++", 
-      "grpc++_test_util", 
+      "gpr",
+      "grpc",
+      "grpc++",
+      "grpc++_test_util",
       "grpc_test_util"
-    ], 
+    ],
     "headers": [
-      "src/proto/grpc/testing/messages.grpc.pb.h", 
-      "src/proto/grpc/testing/messages.pb.h", 
+      "src/proto/grpc/testing/messages.grpc.pb.h",
+      "src/proto/grpc/testing/messages.pb.h",
       "test/cpp/interop/client_helper.h"
-    ], 
-    "language": "c++", 
-    "name": "interop_client_helper", 
+    ],
+    "language": "c++",
+    "name": "interop_client_helper",
     "src": [
-      "test/cpp/interop/client_helper.cc", 
+      "test/cpp/interop/client_helper.cc",
       "test/cpp/interop/client_helper.h"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc++", 
-      "grpc++_test_config", 
-      "grpc++_test_util", 
-      "grpc_test_util", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
+      "grpc++",
+      "grpc++_test_config",
+      "grpc++_test_util",
+      "grpc_test_util",
       "interop_client_helper"
-    ], 
+    ],
     "headers": [
-      "src/proto/grpc/testing/empty.grpc.pb.h", 
-      "src/proto/grpc/testing/empty.pb.h", 
-      "src/proto/grpc/testing/messages.grpc.pb.h", 
-      "src/proto/grpc/testing/messages.pb.h", 
-      "src/proto/grpc/testing/test.grpc.pb.h", 
-      "src/proto/grpc/testing/test.pb.h", 
+      "src/proto/grpc/testing/empty.grpc.pb.h",
+      "src/proto/grpc/testing/empty.pb.h",
+      "src/proto/grpc/testing/messages.grpc.pb.h",
+      "src/proto/grpc/testing/messages.pb.h",
+      "src/proto/grpc/testing/test.grpc.pb.h",
+      "src/proto/grpc/testing/test.pb.h",
       "test/cpp/interop/interop_client.h"
-    ], 
-    "language": "c++", 
-    "name": "interop_client_main", 
+    ],
+    "language": "c++",
+    "name": "interop_client_main",
     "src": [
-      "test/cpp/interop/client.cc", 
-      "test/cpp/interop/interop_client.cc", 
+      "test/cpp/interop/client.cc",
+      "test/cpp/interop/interop_client.cc",
       "test/cpp/interop/interop_client.h"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "grpc", 
-      "grpc++", 
+      "gpr",
+      "grpc",
+      "grpc++",
       "grpc_test_util"
-    ], 
+    ],
     "headers": [
       "test/cpp/interop/server_helper.h"
-    ], 
-    "language": "c++", 
-    "name": "interop_server_helper", 
+    ],
+    "language": "c++",
+    "name": "interop_server_helper",
     "src": [
-      "test/cpp/interop/server_helper.cc", 
+      "test/cpp/interop/server_helper.cc",
       "test/cpp/interop/server_helper.h"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc++", 
-      "grpc++_test_config", 
-      "grpc++_test_util", 
-      "grpc_test_util", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
+      "grpc++",
+      "grpc++_test_config",
+      "grpc++_test_util",
+      "grpc_test_util",
       "interop_server_helper"
-    ], 
+    ],
     "headers": [
-      "src/proto/grpc/testing/empty.grpc.pb.h", 
-      "src/proto/grpc/testing/empty.pb.h", 
-      "src/proto/grpc/testing/messages.grpc.pb.h", 
-      "src/proto/grpc/testing/messages.pb.h", 
-      "src/proto/grpc/testing/test.grpc.pb.h", 
+      "src/proto/grpc/testing/empty.grpc.pb.h",
+      "src/proto/grpc/testing/empty.pb.h",
+      "src/proto/grpc/testing/messages.grpc.pb.h",
+      "src/proto/grpc/testing/messages.pb.h",
+      "src/proto/grpc/testing/test.grpc.pb.h",
       "src/proto/grpc/testing/test.pb.h"
-    ], 
-    "language": "c++", 
-    "name": "interop_server_main", 
+    ],
+    "language": "c++",
+    "name": "interop_server_main",
     "src": [
       "test/cpp/interop/server_main.cc"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "grpc++", 
-      "grpc++_test_util", 
+      "grpc++",
+      "grpc++_test_util",
       "grpc_test_util"
-    ], 
+    ],
     "headers": [
-      "src/proto/grpc/testing/control.grpc.pb.h", 
-      "src/proto/grpc/testing/control.pb.h", 
-      "src/proto/grpc/testing/messages.grpc.pb.h", 
-      "src/proto/grpc/testing/messages.pb.h", 
-      "src/proto/grpc/testing/payloads.grpc.pb.h", 
-      "src/proto/grpc/testing/payloads.pb.h", 
-      "src/proto/grpc/testing/perf_db.grpc.pb.h", 
-      "src/proto/grpc/testing/perf_db.pb.h", 
-      "src/proto/grpc/testing/services.grpc.pb.h", 
-      "src/proto/grpc/testing/services.pb.h", 
-      "src/proto/grpc/testing/stats.grpc.pb.h", 
-      "src/proto/grpc/testing/stats.pb.h", 
-      "test/cpp/qps/client.h", 
-      "test/cpp/qps/driver.h", 
-      "test/cpp/qps/histogram.h", 
-      "test/cpp/qps/interarrival.h", 
-      "test/cpp/qps/limit_cores.h", 
-      "test/cpp/qps/perf_db_client.h", 
-      "test/cpp/qps/qps_worker.h", 
-      "test/cpp/qps/report.h", 
-      "test/cpp/qps/server.h", 
-      "test/cpp/qps/stats.h", 
-      "test/cpp/qps/usage_timer.h", 
+      "src/proto/grpc/testing/control.grpc.pb.h",
+      "src/proto/grpc/testing/control.pb.h",
+      "src/proto/grpc/testing/messages.grpc.pb.h",
+      "src/proto/grpc/testing/messages.pb.h",
+      "src/proto/grpc/testing/payloads.grpc.pb.h",
+      "src/proto/grpc/testing/payloads.pb.h",
+      "src/proto/grpc/testing/perf_db.grpc.pb.h",
+      "src/proto/grpc/testing/perf_db.pb.h",
+      "src/proto/grpc/testing/services.grpc.pb.h",
+      "src/proto/grpc/testing/services.pb.h",
+      "src/proto/grpc/testing/stats.grpc.pb.h",
+      "src/proto/grpc/testing/stats.pb.h",
+      "test/cpp/qps/client.h",
+      "test/cpp/qps/driver.h",
+      "test/cpp/qps/histogram.h",
+      "test/cpp/qps/interarrival.h",
+      "test/cpp/qps/limit_cores.h",
+      "test/cpp/qps/perf_db_client.h",
+      "test/cpp/qps/qps_worker.h",
+      "test/cpp/qps/report.h",
+      "test/cpp/qps/server.h",
+      "test/cpp/qps/stats.h",
+      "test/cpp/qps/usage_timer.h",
       "test/cpp/util/benchmark_config.h"
-    ], 
-    "language": "c++", 
-    "name": "qps", 
+    ],
+    "language": "c++",
+    "name": "qps",
     "src": [
-      "test/cpp/qps/client.h", 
-      "test/cpp/qps/client_async.cc", 
-      "test/cpp/qps/client_sync.cc", 
-      "test/cpp/qps/driver.cc", 
-      "test/cpp/qps/driver.h", 
-      "test/cpp/qps/histogram.h", 
-      "test/cpp/qps/interarrival.h", 
-      "test/cpp/qps/limit_cores.cc", 
-      "test/cpp/qps/limit_cores.h", 
-      "test/cpp/qps/perf_db_client.cc", 
-      "test/cpp/qps/perf_db_client.h", 
-      "test/cpp/qps/qps_worker.cc", 
-      "test/cpp/qps/qps_worker.h", 
-      "test/cpp/qps/report.cc", 
-      "test/cpp/qps/report.h", 
-      "test/cpp/qps/server.h", 
-      "test/cpp/qps/server_async.cc", 
-      "test/cpp/qps/server_sync.cc", 
-      "test/cpp/qps/stats.h", 
-      "test/cpp/qps/usage_timer.cc", 
-      "test/cpp/qps/usage_timer.h", 
-      "test/cpp/util/benchmark_config.cc", 
+      "test/cpp/qps/client.h",
+      "test/cpp/qps/client_async.cc",
+      "test/cpp/qps/client_sync.cc",
+      "test/cpp/qps/driver.cc",
+      "test/cpp/qps/driver.h",
+      "test/cpp/qps/histogram.h",
+      "test/cpp/qps/interarrival.h",
+      "test/cpp/qps/limit_cores.cc",
+      "test/cpp/qps/limit_cores.h",
+      "test/cpp/qps/perf_db_client.cc",
+      "test/cpp/qps/perf_db_client.h",
+      "test/cpp/qps/qps_worker.cc",
+      "test/cpp/qps/qps_worker.h",
+      "test/cpp/qps/report.cc",
+      "test/cpp/qps/report.h",
+      "test/cpp/qps/server.h",
+      "test/cpp/qps/server_async.cc",
+      "test/cpp/qps/server_sync.cc",
+      "test/cpp/qps/stats.h",
+      "test/cpp/qps/usage_timer.cc",
+      "test/cpp/qps/usage_timer.h",
+      "test/cpp/util/benchmark_config.cc",
       "test/cpp/util/benchmark_config.h"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
+      "gpr",
       "grpc"
-    ], 
-    "headers": [], 
-    "language": "csharp", 
-    "name": "grpc_csharp_ext", 
+    ],
+    "headers": [],
+    "language": "csharp",
+    "name": "grpc_csharp_ext",
     "src": [
       "src/csharp/ext/grpc_csharp_ext.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "lib"
-  }, 
+  },
   {
-    "deps": [], 
+    "deps": [],
     "headers": [
-      "third_party/boringssl/crypto/aes/internal.h", 
-      "third_party/boringssl/crypto/asn1/asn1_locl.h", 
-      "third_party/boringssl/crypto/bio/internal.h", 
-      "third_party/boringssl/crypto/bn/internal.h", 
-      "third_party/boringssl/crypto/bn/rsaz_exp.h", 
-      "third_party/boringssl/crypto/bytestring/internal.h", 
-      "third_party/boringssl/crypto/cipher/internal.h", 
-      "third_party/boringssl/crypto/conf/conf_def.h", 
-      "third_party/boringssl/crypto/conf/internal.h", 
-      "third_party/boringssl/crypto/curve25519/internal.h", 
-      "third_party/boringssl/crypto/des/internal.h", 
-      "third_party/boringssl/crypto/dh/internal.h", 
-      "third_party/boringssl/crypto/digest/internal.h", 
-      "third_party/boringssl/crypto/digest/md32_common.h", 
-      "third_party/boringssl/crypto/directory.h", 
-      "third_party/boringssl/crypto/ec/internal.h", 
-      "third_party/boringssl/crypto/ec/p256-x86_64-table.h", 
-      "third_party/boringssl/crypto/evp/internal.h", 
-      "third_party/boringssl/crypto/internal.h", 
-      "third_party/boringssl/crypto/modes/internal.h", 
-      "third_party/boringssl/crypto/obj/obj_dat.h", 
-      "third_party/boringssl/crypto/obj/obj_xref.h", 
-      "third_party/boringssl/crypto/pkcs8/internal.h", 
-      "third_party/boringssl/crypto/rand/internal.h", 
-      "third_party/boringssl/crypto/rsa/internal.h", 
-      "third_party/boringssl/crypto/test/scoped_types.h", 
-      "third_party/boringssl/crypto/test/test_util.h", 
-      "third_party/boringssl/crypto/x509/charmap.h", 
-      "third_party/boringssl/crypto/x509/vpm_int.h", 
-      "third_party/boringssl/crypto/x509v3/ext_dat.h", 
-      "third_party/boringssl/crypto/x509v3/pcy_int.h", 
-      "third_party/boringssl/include/openssl/aead.h", 
-      "third_party/boringssl/include/openssl/aes.h", 
-      "third_party/boringssl/include/openssl/arm_arch.h", 
-      "third_party/boringssl/include/openssl/asn1.h", 
-      "third_party/boringssl/include/openssl/asn1_mac.h", 
-      "third_party/boringssl/include/openssl/asn1t.h", 
-      "third_party/boringssl/include/openssl/base.h", 
-      "third_party/boringssl/include/openssl/base64.h", 
-      "third_party/boringssl/include/openssl/bio.h", 
-      "third_party/boringssl/include/openssl/blowfish.h", 
-      "third_party/boringssl/include/openssl/bn.h", 
-      "third_party/boringssl/include/openssl/buf.h", 
-      "third_party/boringssl/include/openssl/buffer.h", 
-      "third_party/boringssl/include/openssl/bytestring.h", 
-      "third_party/boringssl/include/openssl/cast.h", 
-      "third_party/boringssl/include/openssl/chacha.h", 
-      "third_party/boringssl/include/openssl/cipher.h", 
-      "third_party/boringssl/include/openssl/cmac.h", 
-      "third_party/boringssl/include/openssl/conf.h", 
-      "third_party/boringssl/include/openssl/cpu.h", 
-      "third_party/boringssl/include/openssl/crypto.h", 
-      "third_party/boringssl/include/openssl/curve25519.h", 
-      "third_party/boringssl/include/openssl/des.h", 
-      "third_party/boringssl/include/openssl/dh.h", 
-      "third_party/boringssl/include/openssl/digest.h", 
-      "third_party/boringssl/include/openssl/dsa.h", 
-      "third_party/boringssl/include/openssl/dtls1.h", 
-      "third_party/boringssl/include/openssl/ec.h", 
-      "third_party/boringssl/include/openssl/ec_key.h", 
-      "third_party/boringssl/include/openssl/ecdh.h", 
-      "third_party/boringssl/include/openssl/ecdsa.h", 
-      "third_party/boringssl/include/openssl/engine.h", 
-      "third_party/boringssl/include/openssl/err.h", 
-      "third_party/boringssl/include/openssl/evp.h", 
-      "third_party/boringssl/include/openssl/ex_data.h", 
-      "third_party/boringssl/include/openssl/hkdf.h", 
-      "third_party/boringssl/include/openssl/hmac.h", 
-      "third_party/boringssl/include/openssl/lhash.h", 
-      "third_party/boringssl/include/openssl/lhash_macros.h", 
-      "third_party/boringssl/include/openssl/md4.h", 
-      "third_party/boringssl/include/openssl/md5.h", 
-      "third_party/boringssl/include/openssl/mem.h", 
-      "third_party/boringssl/include/openssl/obj.h", 
-      "third_party/boringssl/include/openssl/obj_mac.h", 
-      "third_party/boringssl/include/openssl/objects.h", 
-      "third_party/boringssl/include/openssl/opensslfeatures.h", 
-      "third_party/boringssl/include/openssl/opensslv.h", 
-      "third_party/boringssl/include/openssl/ossl_typ.h", 
-      "third_party/boringssl/include/openssl/pem.h", 
-      "third_party/boringssl/include/openssl/pkcs12.h", 
-      "third_party/boringssl/include/openssl/pkcs7.h", 
-      "third_party/boringssl/include/openssl/pkcs8.h", 
-      "third_party/boringssl/include/openssl/poly1305.h", 
-      "third_party/boringssl/include/openssl/pqueue.h", 
-      "third_party/boringssl/include/openssl/rand.h", 
-      "third_party/boringssl/include/openssl/rc4.h", 
-      "third_party/boringssl/include/openssl/rsa.h", 
-      "third_party/boringssl/include/openssl/safestack.h", 
-      "third_party/boringssl/include/openssl/sha.h", 
-      "third_party/boringssl/include/openssl/srtp.h", 
-      "third_party/boringssl/include/openssl/ssl.h", 
-      "third_party/boringssl/include/openssl/ssl3.h", 
-      "third_party/boringssl/include/openssl/stack.h", 
-      "third_party/boringssl/include/openssl/stack_macros.h", 
-      "third_party/boringssl/include/openssl/thread.h", 
-      "third_party/boringssl/include/openssl/time_support.h", 
-      "third_party/boringssl/include/openssl/tls1.h", 
-      "third_party/boringssl/include/openssl/type_check.h", 
-      "third_party/boringssl/include/openssl/x509.h", 
-      "third_party/boringssl/include/openssl/x509_vfy.h", 
-      "third_party/boringssl/include/openssl/x509v3.h", 
-      "third_party/boringssl/ssl/internal.h", 
-      "third_party/boringssl/ssl/test/async_bio.h", 
-      "third_party/boringssl/ssl/test/packeted_bio.h", 
-      "third_party/boringssl/ssl/test/scoped_types.h", 
+      "third_party/boringssl/crypto/aes/internal.h",
+      "third_party/boringssl/crypto/asn1/asn1_locl.h",
+      "third_party/boringssl/crypto/bio/internal.h",
+      "third_party/boringssl/crypto/bn/internal.h",
+      "third_party/boringssl/crypto/bn/rsaz_exp.h",
+      "third_party/boringssl/crypto/bytestring/internal.h",
+      "third_party/boringssl/crypto/cipher/internal.h",
+      "third_party/boringssl/crypto/conf/conf_def.h",
+      "third_party/boringssl/crypto/conf/internal.h",
+      "third_party/boringssl/crypto/curve25519/internal.h",
+      "third_party/boringssl/crypto/des/internal.h",
+      "third_party/boringssl/crypto/dh/internal.h",
+      "third_party/boringssl/crypto/digest/internal.h",
+      "third_party/boringssl/crypto/digest/md32_common.h",
+      "third_party/boringssl/crypto/directory.h",
+      "third_party/boringssl/crypto/ec/internal.h",
+      "third_party/boringssl/crypto/ec/p256-x86_64-table.h",
+      "third_party/boringssl/crypto/evp/internal.h",
+      "third_party/boringssl/crypto/internal.h",
+      "third_party/boringssl/crypto/modes/internal.h",
+      "third_party/boringssl/crypto/obj/obj_dat.h",
+      "third_party/boringssl/crypto/obj/obj_xref.h",
+      "third_party/boringssl/crypto/pkcs8/internal.h",
+      "third_party/boringssl/crypto/rand/internal.h",
+      "third_party/boringssl/crypto/rsa/internal.h",
+      "third_party/boringssl/crypto/test/scoped_types.h",
+      "third_party/boringssl/crypto/test/test_util.h",
+      "third_party/boringssl/crypto/x509/charmap.h",
+      "third_party/boringssl/crypto/x509/vpm_int.h",
+      "third_party/boringssl/crypto/x509v3/ext_dat.h",
+      "third_party/boringssl/crypto/x509v3/pcy_int.h",
+      "third_party/boringssl/include/openssl/aead.h",
+      "third_party/boringssl/include/openssl/aes.h",
+      "third_party/boringssl/include/openssl/arm_arch.h",
+      "third_party/boringssl/include/openssl/asn1.h",
+      "third_party/boringssl/include/openssl/asn1_mac.h",
+      "third_party/boringssl/include/openssl/asn1t.h",
+      "third_party/boringssl/include/openssl/base.h",
+      "third_party/boringssl/include/openssl/base64.h",
+      "third_party/boringssl/include/openssl/bio.h",
+      "third_party/boringssl/include/openssl/blowfish.h",
+      "third_party/boringssl/include/openssl/bn.h",
+      "third_party/boringssl/include/openssl/buf.h",
+      "third_party/boringssl/include/openssl/buffer.h",
+      "third_party/boringssl/include/openssl/bytestring.h",
+      "third_party/boringssl/include/openssl/cast.h",
+      "third_party/boringssl/include/openssl/chacha.h",
+      "third_party/boringssl/include/openssl/cipher.h",
+      "third_party/boringssl/include/openssl/cmac.h",
+      "third_party/boringssl/include/openssl/conf.h",
+      "third_party/boringssl/include/openssl/cpu.h",
+      "third_party/boringssl/include/openssl/crypto.h",
+      "third_party/boringssl/include/openssl/curve25519.h",
+      "third_party/boringssl/include/openssl/des.h",
+      "third_party/boringssl/include/openssl/dh.h",
+      "third_party/boringssl/include/openssl/digest.h",
+      "third_party/boringssl/include/openssl/dsa.h",
+      "third_party/boringssl/include/openssl/dtls1.h",
+      "third_party/boringssl/include/openssl/ec.h",
+      "third_party/boringssl/include/openssl/ec_key.h",
+      "third_party/boringssl/include/openssl/ecdh.h",
+      "third_party/boringssl/include/openssl/ecdsa.h",
+      "third_party/boringssl/include/openssl/engine.h",
+      "third_party/boringssl/include/openssl/err.h",
+      "third_party/boringssl/include/openssl/evp.h",
+      "third_party/boringssl/include/openssl/ex_data.h",
+      "third_party/boringssl/include/openssl/hkdf.h",
+      "third_party/boringssl/include/openssl/hmac.h",
+      "third_party/boringssl/include/openssl/lhash.h",
+      "third_party/boringssl/include/openssl/lhash_macros.h",
+      "third_party/boringssl/include/openssl/md4.h",
+      "third_party/boringssl/include/openssl/md5.h",
+      "third_party/boringssl/include/openssl/mem.h",
+      "third_party/boringssl/include/openssl/obj.h",
+      "third_party/boringssl/include/openssl/obj_mac.h",
+      "third_party/boringssl/include/openssl/objects.h",
+      "third_party/boringssl/include/openssl/opensslfeatures.h",
+      "third_party/boringssl/include/openssl/opensslv.h",
+      "third_party/boringssl/include/openssl/ossl_typ.h",
+      "third_party/boringssl/include/openssl/pem.h",
+      "third_party/boringssl/include/openssl/pkcs12.h",
+      "third_party/boringssl/include/openssl/pkcs7.h",
+      "third_party/boringssl/include/openssl/pkcs8.h",
+      "third_party/boringssl/include/openssl/poly1305.h",
+      "third_party/boringssl/include/openssl/pqueue.h",
+      "third_party/boringssl/include/openssl/rand.h",
+      "third_party/boringssl/include/openssl/rc4.h",
+      "third_party/boringssl/include/openssl/rsa.h",
+      "third_party/boringssl/include/openssl/safestack.h",
+      "third_party/boringssl/include/openssl/sha.h",
+      "third_party/boringssl/include/openssl/srtp.h",
+      "third_party/boringssl/include/openssl/ssl.h",
+      "third_party/boringssl/include/openssl/ssl3.h",
+      "third_party/boringssl/include/openssl/stack.h",
+      "third_party/boringssl/include/openssl/stack_macros.h",
+      "third_party/boringssl/include/openssl/thread.h",
+      "third_party/boringssl/include/openssl/time_support.h",
+      "third_party/boringssl/include/openssl/tls1.h",
+      "third_party/boringssl/include/openssl/type_check.h",
+      "third_party/boringssl/include/openssl/x509.h",
+      "third_party/boringssl/include/openssl/x509_vfy.h",
+      "third_party/boringssl/include/openssl/x509v3.h",
+      "third_party/boringssl/ssl/internal.h",
+      "third_party/boringssl/ssl/test/async_bio.h",
+      "third_party/boringssl/ssl/test/packeted_bio.h",
+      "third_party/boringssl/ssl/test/scoped_types.h",
       "third_party/boringssl/ssl/test/test_config.h"
-    ], 
-    "language": "c", 
-    "name": "boringssl", 
+    ],
+    "language": "c",
+    "name": "boringssl",
     "src": [
       "src/boringssl/err_data.c"
-    ], 
-    "third_party": true, 
+    ],
+    "third_party": true,
     "type": "lib"
-  }, 
+  },
   {
-    "deps": [], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_test_util", 
-    "src": [], 
-    "third_party": true, 
+    "deps": [],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_test_util",
+    "src": [],
+    "third_party": true,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
+      "boringssl",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_aes_test_lib", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_aes_test_lib",
+    "src": [],
+    "third_party": true,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
+      "boringssl",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_asn1_test_lib", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_asn1_test_lib",
+    "src": [],
+    "third_party": true,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
+      "boringssl",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_base64_test_lib", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_base64_test_lib",
+    "src": [],
+    "third_party": true,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
+      "boringssl",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_bio_test_lib", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_bio_test_lib",
+    "src": [],
+    "third_party": true,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
+      "boringssl",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_bn_test_lib", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_bn_test_lib",
+    "src": [],
+    "third_party": true,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
+      "boringssl",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_bytestring_test_lib", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_bytestring_test_lib",
+    "src": [],
+    "third_party": true,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
+      "boringssl",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_aead_test_lib", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_aead_test_lib",
+    "src": [],
+    "third_party": true,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
+      "boringssl",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_cipher_test_lib", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_cipher_test_lib",
+    "src": [],
+    "third_party": true,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
+      "boringssl",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_cmac_test_lib", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_cmac_test_lib",
+    "src": [],
+    "third_party": true,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
+      "boringssl",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "boringssl_constant_time_test_lib", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "boringssl_constant_time_test_lib",
+    "src": [],
+    "third_party": true,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
+      "boringssl",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_ed25519_test_lib", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_ed25519_test_lib",
+    "src": [],
+    "third_party": true,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
+      "boringssl",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_x25519_test_lib", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_x25519_test_lib",
+    "src": [],
+    "third_party": true,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
+      "boringssl",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_dh_test_lib", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_dh_test_lib",
+    "src": [],
+    "third_party": true,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
+      "boringssl",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_digest_test_lib", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_digest_test_lib",
+    "src": [],
+    "third_party": true,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
+      "boringssl",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "boringssl_dsa_test_lib", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "boringssl_dsa_test_lib",
+    "src": [],
+    "third_party": true,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
+      "boringssl",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_ec_test_lib", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_ec_test_lib",
+    "src": [],
+    "third_party": true,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
+      "boringssl",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "boringssl_example_mul_lib", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "boringssl_example_mul_lib",
+    "src": [],
+    "third_party": true,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
+      "boringssl",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_ecdsa_test_lib", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_ecdsa_test_lib",
+    "src": [],
+    "third_party": true,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
+      "boringssl",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_err_test_lib", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_err_test_lib",
+    "src": [],
+    "third_party": true,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
+      "boringssl",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_evp_extra_test_lib", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_evp_extra_test_lib",
+    "src": [],
+    "third_party": true,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
+      "boringssl",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_evp_test_lib", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_evp_test_lib",
+    "src": [],
+    "third_party": true,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
+      "boringssl",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_pbkdf_test_lib", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_pbkdf_test_lib",
+    "src": [],
+    "third_party": true,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
+      "boringssl",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "boringssl_hkdf_test_lib", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "boringssl_hkdf_test_lib",
+    "src": [],
+    "third_party": true,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
+      "boringssl",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_hmac_test_lib", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_hmac_test_lib",
+    "src": [],
+    "third_party": true,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
+      "boringssl",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "boringssl_lhash_test_lib", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "boringssl_lhash_test_lib",
+    "src": [],
+    "third_party": true,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
+      "boringssl",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "boringssl_gcm_test_lib", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "boringssl_gcm_test_lib",
+    "src": [],
+    "third_party": true,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
+      "boringssl",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_pkcs12_test_lib", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_pkcs12_test_lib",
+    "src": [],
+    "third_party": true,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
+      "boringssl",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_pkcs8_test_lib", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_pkcs8_test_lib",
+    "src": [],
+    "third_party": true,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
+      "boringssl",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_poly1305_test_lib", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_poly1305_test_lib",
+    "src": [],
+    "third_party": true,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
+      "boringssl",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "boringssl_refcount_test_lib", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "boringssl_refcount_test_lib",
+    "src": [],
+    "third_party": true,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
+      "boringssl",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_rsa_test_lib", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_rsa_test_lib",
+    "src": [],
+    "third_party": true,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
+      "boringssl",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "boringssl_thread_test_lib", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "boringssl_thread_test_lib",
+    "src": [],
+    "third_party": true,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
+      "boringssl",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "boringssl_pkcs7_test_lib", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "boringssl_pkcs7_test_lib",
+    "src": [],
+    "third_party": true,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
+      "boringssl",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_x509_test_lib", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_x509_test_lib",
+    "src": [],
+    "third_party": true,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
+      "boringssl",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "boringssl_tab_test_lib", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "boringssl_tab_test_lib",
+    "src": [],
+    "third_party": true,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
+      "boringssl",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "boringssl_v3name_test_lib", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "boringssl_v3name_test_lib",
+    "src": [],
+    "third_party": true,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
+      "boringssl",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "boringssl_pqueue_test_lib", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "boringssl_pqueue_test_lib",
+    "src": [],
+    "third_party": true,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "boringssl", 
+      "boringssl",
       "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "language": "c++", 
-    "name": "boringssl_ssl_test_lib", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "headers": [],
+    "language": "c++",
+    "name": "boringssl_ssl_test_lib",
+    "src": [],
+    "third_party": true,
     "type": "lib"
-  }, 
+  },
   {
-    "deps": [], 
+    "deps": [],
     "headers": [
-      "third_party/zlib/crc32.h", 
-      "third_party/zlib/deflate.h", 
-      "third_party/zlib/gzguts.h", 
-      "third_party/zlib/inffast.h", 
-      "third_party/zlib/inffixed.h", 
-      "third_party/zlib/inflate.h", 
-      "third_party/zlib/inftrees.h", 
-      "third_party/zlib/trees.h", 
-      "third_party/zlib/zconf.h", 
-      "third_party/zlib/zlib.h", 
+      "third_party/zlib/crc32.h",
+      "third_party/zlib/deflate.h",
+      "third_party/zlib/gzguts.h",
+      "third_party/zlib/inffast.h",
+      "third_party/zlib/inffixed.h",
+      "third_party/zlib/inflate.h",
+      "third_party/zlib/inftrees.h",
+      "third_party/zlib/trees.h",
+      "third_party/zlib/zconf.h",
+      "third_party/zlib/zlib.h",
       "third_party/zlib/zutil.h"
-    ], 
-    "language": "c", 
-    "name": "z", 
-    "src": [], 
-    "third_party": true, 
+    ],
+    "language": "c",
+    "name": "z",
+    "src": [],
+    "third_party": true,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc_test_util_unsecure", 
+      "gpr",
+      "gpr_test_util",
+      "grpc_test_util_unsecure",
       "grpc_unsecure"
-    ], 
+    ],
     "headers": [
       "test/core/bad_client/bad_client.h"
-    ], 
-    "language": "c", 
-    "name": "bad_client_test", 
+    ],
+    "language": "c",
+    "name": "bad_client_test",
     "src": [
-      "test/core/bad_client/bad_client.c", 
+      "test/core/bad_client/bad_client.c",
       "test/core/bad_client/bad_client.h"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
+    ],
     "headers": [
       "test/core/bad_ssl/server_common.h"
-    ], 
-    "language": "c", 
-    "name": "bad_ssl_test_server", 
+    ],
+    "language": "c",
+    "name": "bad_ssl_test_server",
     "src": [
-      "test/core/bad_ssl/server_common.c", 
+      "test/core/bad_ssl/server_common.c",
       "test/core/bad_ssl/server_common.h"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
+      "gpr",
+      "gpr_test_util",
+      "grpc",
       "grpc_test_util"
-    ], 
+    ],
     "headers": [
-      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/end2end_tests.h",
       "test/core/end2end/tests/cancel_test_helpers.h"
-    ], 
-    "language": "c", 
-    "name": "end2end_tests", 
+    ],
+    "language": "c",
+    "name": "end2end_tests",
     "src": [
-      "test/core/end2end/end2end_tests.c", 
-      "test/core/end2end/end2end_tests.h", 
-      "test/core/end2end/tests/bad_hostname.c", 
-      "test/core/end2end/tests/binary_metadata.c", 
-      "test/core/end2end/tests/call_creds.c", 
-      "test/core/end2end/tests/cancel_after_accept.c", 
-      "test/core/end2end/tests/cancel_after_client_done.c", 
-      "test/core/end2end/tests/cancel_after_invoke.c", 
-      "test/core/end2end/tests/cancel_before_invoke.c", 
-      "test/core/end2end/tests/cancel_in_a_vacuum.c", 
-      "test/core/end2end/tests/cancel_test_helpers.h", 
-      "test/core/end2end/tests/cancel_with_status.c", 
-      "test/core/end2end/tests/compressed_payload.c", 
-      "test/core/end2end/tests/connectivity.c", 
-      "test/core/end2end/tests/default_host.c", 
-      "test/core/end2end/tests/disappearing_server.c", 
-      "test/core/end2end/tests/empty_batch.c", 
-      "test/core/end2end/tests/filter_causes_close.c", 
-      "test/core/end2end/tests/graceful_server_shutdown.c", 
-      "test/core/end2end/tests/high_initial_seqno.c", 
-      "test/core/end2end/tests/hpack_size.c", 
-      "test/core/end2end/tests/idempotent_request.c", 
-      "test/core/end2end/tests/invoke_large_request.c", 
-      "test/core/end2end/tests/large_metadata.c", 
-      "test/core/end2end/tests/max_concurrent_streams.c", 
-      "test/core/end2end/tests/max_message_length.c", 
-      "test/core/end2end/tests/negative_deadline.c", 
-      "test/core/end2end/tests/no_op.c", 
-      "test/core/end2end/tests/payload.c", 
-      "test/core/end2end/tests/ping.c", 
-      "test/core/end2end/tests/ping_pong_streaming.c", 
-      "test/core/end2end/tests/registered_call.c", 
-      "test/core/end2end/tests/request_with_flags.c", 
-      "test/core/end2end/tests/request_with_payload.c", 
-      "test/core/end2end/tests/server_finishes_request.c", 
-      "test/core/end2end/tests/shutdown_finishes_calls.c", 
-      "test/core/end2end/tests/shutdown_finishes_tags.c", 
-      "test/core/end2end/tests/simple_delayed_request.c", 
-      "test/core/end2end/tests/simple_metadata.c", 
-      "test/core/end2end/tests/simple_request.c", 
+      "test/core/end2end/end2end_tests.c",
+      "test/core/end2end/end2end_tests.h",
+      "test/core/end2end/tests/bad_hostname.c",
+      "test/core/end2end/tests/binary_metadata.c",
+      "test/core/end2end/tests/call_creds.c",
+      "test/core/end2end/tests/cancel_after_accept.c",
+      "test/core/end2end/tests/cancel_after_client_done.c",
+      "test/core/end2end/tests/cancel_after_invoke.c",
+      "test/core/end2end/tests/cancel_before_invoke.c",
+      "test/core/end2end/tests/cancel_in_a_vacuum.c",
+      "test/core/end2end/tests/cancel_test_helpers.h",
+      "test/core/end2end/tests/cancel_with_status.c",
+      "test/core/end2end/tests/compressed_payload.c",
+      "test/core/end2end/tests/connectivity.c",
+      "test/core/end2end/tests/default_host.c",
+      "test/core/end2end/tests/disappearing_server.c",
+      "test/core/end2end/tests/empty_batch.c",
+      "test/core/end2end/tests/filter_causes_close.c",
+      "test/core/end2end/tests/graceful_server_shutdown.c",
+      "test/core/end2end/tests/high_initial_seqno.c",
+      "test/core/end2end/tests/hpack_size.c",
+      "test/core/end2end/tests/idempotent_request.c",
+      "test/core/end2end/tests/invoke_large_request.c",
+      "test/core/end2end/tests/large_metadata.c",
+      "test/core/end2end/tests/max_concurrent_streams.c",
+      "test/core/end2end/tests/max_message_length.c",
+      "test/core/end2end/tests/negative_deadline.c",
+      "test/core/end2end/tests/no_op.c",
+      "test/core/end2end/tests/payload.c",
+      "test/core/end2end/tests/ping.c",
+      "test/core/end2end/tests/ping_pong_streaming.c",
+      "test/core/end2end/tests/registered_call.c",
+      "test/core/end2end/tests/request_with_flags.c",
+      "test/core/end2end/tests/request_with_payload.c",
+      "test/core/end2end/tests/server_finishes_request.c",
+      "test/core/end2end/tests/shutdown_finishes_calls.c",
+      "test/core/end2end/tests/shutdown_finishes_tags.c",
+      "test/core/end2end/tests/simple_delayed_request.c",
+      "test/core/end2end/tests/simple_metadata.c",
+      "test/core/end2end/tests/simple_request.c",
       "test/core/end2end/tests/trailing_metadata.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc_test_util_unsecure", 
+      "gpr",
+      "gpr_test_util",
+      "grpc_test_util_unsecure",
       "grpc_unsecure"
-    ], 
+    ],
     "headers": [
-      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/end2end_tests.h",
       "test/core/end2end/tests/cancel_test_helpers.h"
-    ], 
-    "language": "c", 
-    "name": "end2end_nosec_tests", 
+    ],
+    "language": "c",
+    "name": "end2end_nosec_tests",
     "src": [
-      "test/core/end2end/end2end_nosec_tests.c", 
-      "test/core/end2end/end2end_tests.h", 
-      "test/core/end2end/tests/bad_hostname.c", 
-      "test/core/end2end/tests/binary_metadata.c", 
-      "test/core/end2end/tests/cancel_after_accept.c", 
-      "test/core/end2end/tests/cancel_after_client_done.c", 
-      "test/core/end2end/tests/cancel_after_invoke.c", 
-      "test/core/end2end/tests/cancel_before_invoke.c", 
-      "test/core/end2end/tests/cancel_in_a_vacuum.c", 
-      "test/core/end2end/tests/cancel_test_helpers.h", 
-      "test/core/end2end/tests/cancel_with_status.c", 
-      "test/core/end2end/tests/compressed_payload.c", 
-      "test/core/end2end/tests/connectivity.c", 
-      "test/core/end2end/tests/default_host.c", 
-      "test/core/end2end/tests/disappearing_server.c", 
-      "test/core/end2end/tests/empty_batch.c", 
-      "test/core/end2end/tests/filter_causes_close.c", 
-      "test/core/end2end/tests/graceful_server_shutdown.c", 
-      "test/core/end2end/tests/high_initial_seqno.c", 
-      "test/core/end2end/tests/hpack_size.c", 
-      "test/core/end2end/tests/idempotent_request.c", 
-      "test/core/end2end/tests/invoke_large_request.c", 
-      "test/core/end2end/tests/large_metadata.c", 
-      "test/core/end2end/tests/max_concurrent_streams.c", 
-      "test/core/end2end/tests/max_message_length.c", 
-      "test/core/end2end/tests/negative_deadline.c", 
-      "test/core/end2end/tests/no_op.c", 
-      "test/core/end2end/tests/payload.c", 
-      "test/core/end2end/tests/ping.c", 
-      "test/core/end2end/tests/ping_pong_streaming.c", 
-      "test/core/end2end/tests/registered_call.c", 
-      "test/core/end2end/tests/request_with_flags.c", 
-      "test/core/end2end/tests/request_with_payload.c", 
-      "test/core/end2end/tests/server_finishes_request.c", 
-      "test/core/end2end/tests/shutdown_finishes_calls.c", 
-      "test/core/end2end/tests/shutdown_finishes_tags.c", 
-      "test/core/end2end/tests/simple_delayed_request.c", 
-      "test/core/end2end/tests/simple_metadata.c", 
-      "test/core/end2end/tests/simple_request.c", 
+      "test/core/end2end/end2end_nosec_tests.c",
+      "test/core/end2end/end2end_tests.h",
+      "test/core/end2end/tests/bad_hostname.c",
+      "test/core/end2end/tests/binary_metadata.c",
+      "test/core/end2end/tests/cancel_after_accept.c",
+      "test/core/end2end/tests/cancel_after_client_done.c",
+      "test/core/end2end/tests/cancel_after_invoke.c",
+      "test/core/end2end/tests/cancel_before_invoke.c",
+      "test/core/end2end/tests/cancel_in_a_vacuum.c",
+      "test/core/end2end/tests/cancel_test_helpers.h",
+      "test/core/end2end/tests/cancel_with_status.c",
+      "test/core/end2end/tests/compressed_payload.c",
+      "test/core/end2end/tests/connectivity.c",
+      "test/core/end2end/tests/default_host.c",
+      "test/core/end2end/tests/disappearing_server.c",
+      "test/core/end2end/tests/empty_batch.c",
+      "test/core/end2end/tests/filter_causes_close.c",
+      "test/core/end2end/tests/graceful_server_shutdown.c",
+      "test/core/end2end/tests/high_initial_seqno.c",
+      "test/core/end2end/tests/hpack_size.c",
+      "test/core/end2end/tests/idempotent_request.c",
+      "test/core/end2end/tests/invoke_large_request.c",
+      "test/core/end2end/tests/large_metadata.c",
+      "test/core/end2end/tests/max_concurrent_streams.c",
+      "test/core/end2end/tests/max_message_length.c",
+      "test/core/end2end/tests/negative_deadline.c",
+      "test/core/end2end/tests/no_op.c",
+      "test/core/end2end/tests/payload.c",
+      "test/core/end2end/tests/ping.c",
+      "test/core/end2end/tests/ping_pong_streaming.c",
+      "test/core/end2end/tests/registered_call.c",
+      "test/core/end2end/tests/request_with_flags.c",
+      "test/core/end2end/tests/request_with_payload.c",
+      "test/core/end2end/tests/server_finishes_request.c",
+      "test/core/end2end/tests/shutdown_finishes_calls.c",
+      "test/core/end2end/tests/shutdown_finishes_tags.c",
+      "test/core/end2end/tests/simple_delayed_request.c",
+      "test/core/end2end/tests/simple_metadata.c",
+      "test/core/end2end/tests/simple_request.c",
       "test/core/end2end/tests/trailing_metadata.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "lib"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
+      "gpr",
       "grpc_base"
-    ], 
+    ],
     "headers": [
-      "include/grpc/census.h", 
-      "src/core/ext/census/aggregation.h", 
-      "src/core/ext/census/census_interface.h", 
-      "src/core/ext/census/census_rpc_stats.h", 
-      "src/core/ext/census/grpc_filter.h", 
-      "src/core/ext/census/mlog.h", 
+      "include/grpc/census.h",
+      "src/core/ext/census/aggregation.h",
+      "src/core/ext/census/census_interface.h",
+      "src/core/ext/census/census_rpc_stats.h",
+      "src/core/ext/census/grpc_filter.h",
+      "src/core/ext/census/mlog.h",
       "src/core/ext/census/rpc_metric_id.h"
-    ], 
-    "language": "c", 
-    "name": "census", 
+    ],
+    "language": "c",
+    "name": "census",
     "src": [
-      "include/grpc/census.h", 
-      "src/core/ext/census/aggregation.h", 
-      "src/core/ext/census/census_interface.h", 
-      "src/core/ext/census/census_rpc_stats.h", 
-      "src/core/ext/census/context.c", 
-      "src/core/ext/census/grpc_context.c", 
-      "src/core/ext/census/grpc_filter.c", 
-      "src/core/ext/census/grpc_filter.h", 
-      "src/core/ext/census/grpc_plugin.c", 
-      "src/core/ext/census/initialize.c", 
-      "src/core/ext/census/mlog.c", 
-      "src/core/ext/census/mlog.h", 
-      "src/core/ext/census/operation.c", 
-      "src/core/ext/census/placeholders.c", 
-      "src/core/ext/census/rpc_metric_id.h", 
+      "include/grpc/census.h",
+      "src/core/ext/census/aggregation.h",
+      "src/core/ext/census/census_interface.h",
+      "src/core/ext/census/census_rpc_stats.h",
+      "src/core/ext/census/context.c",
+      "src/core/ext/census/grpc_context.c",
+      "src/core/ext/census/grpc_filter.c",
+      "src/core/ext/census/grpc_filter.h",
+      "src/core/ext/census/grpc_plugin.c",
+      "src/core/ext/census/initialize.c",
+      "src/core/ext/census/mlog.c",
+      "src/core/ext/census/mlog.h",
+      "src/core/ext/census/operation.c",
+      "src/core/ext/census/placeholders.c",
+      "src/core/ext/census/rpc_metric_id.h",
       "src/core/ext/census/tracing.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "filegroup"
-  }, 
+  },
   {
     "deps": [
       "gpr_codegen"
-    ], 
+    ],
     "headers": [
-      "include/grpc/support/alloc.h", 
-      "include/grpc/support/atm.h", 
-      "include/grpc/support/atm_gcc_atomic.h", 
-      "include/grpc/support/atm_gcc_sync.h", 
-      "include/grpc/support/atm_win32.h", 
-      "include/grpc/support/avl.h", 
-      "include/grpc/support/cmdline.h", 
-      "include/grpc/support/cpu.h", 
-      "include/grpc/support/histogram.h", 
-      "include/grpc/support/host_port.h", 
-      "include/grpc/support/log.h", 
-      "include/grpc/support/log_win32.h", 
-      "include/grpc/support/port_platform.h", 
-      "include/grpc/support/slice.h", 
-      "include/grpc/support/slice_buffer.h", 
-      "include/grpc/support/string_util.h", 
-      "include/grpc/support/subprocess.h", 
-      "include/grpc/support/sync.h", 
-      "include/grpc/support/sync_generic.h", 
-      "include/grpc/support/sync_posix.h", 
-      "include/grpc/support/sync_win32.h", 
-      "include/grpc/support/thd.h", 
-      "include/grpc/support/time.h", 
-      "include/grpc/support/tls.h", 
-      "include/grpc/support/tls_gcc.h", 
-      "include/grpc/support/tls_msvc.h", 
-      "include/grpc/support/tls_pthread.h", 
-      "include/grpc/support/useful.h", 
-      "src/core/lib/profiling/timers.h", 
-      "src/core/lib/support/backoff.h", 
-      "src/core/lib/support/block_annotate.h", 
-      "src/core/lib/support/env.h", 
-      "src/core/lib/support/load_file.h", 
-      "src/core/lib/support/murmur_hash.h", 
-      "src/core/lib/support/stack_lockfree.h", 
-      "src/core/lib/support/string.h", 
-      "src/core/lib/support/string_win32.h", 
-      "src/core/lib/support/thd_internal.h", 
-      "src/core/lib/support/time_precise.h", 
+      "include/grpc/support/alloc.h",
+      "include/grpc/support/atm.h",
+      "include/grpc/support/atm_gcc_atomic.h",
+      "include/grpc/support/atm_gcc_sync.h",
+      "include/grpc/support/atm_windows.h",
+      "include/grpc/support/avl.h",
+      "include/grpc/support/cmdline.h",
+      "include/grpc/support/cpu.h",
+      "include/grpc/support/histogram.h",
+      "include/grpc/support/host_port.h",
+      "include/grpc/support/log.h",
+      "include/grpc/support/log_windows.h",
+      "include/grpc/support/port_platform.h",
+      "include/grpc/support/slice.h",
+      "include/grpc/support/slice_buffer.h",
+      "include/grpc/support/string_util.h",
+      "include/grpc/support/subprocess.h",
+      "include/grpc/support/sync.h",
+      "include/grpc/support/sync_generic.h",
+      "include/grpc/support/sync_posix.h",
+      "include/grpc/support/sync_windows.h",
+      "include/grpc/support/thd.h",
+      "include/grpc/support/time.h",
+      "include/grpc/support/tls.h",
+      "include/grpc/support/tls_gcc.h",
+      "include/grpc/support/tls_msvc.h",
+      "include/grpc/support/tls_pthread.h",
+      "include/grpc/support/useful.h",
+      "src/core/lib/profiling/timers.h",
+      "src/core/lib/support/backoff.h",
+      "src/core/lib/support/block_annotate.h",
+      "src/core/lib/support/env.h",
+      "src/core/lib/support/load_file.h",
+      "src/core/lib/support/murmur_hash.h",
+      "src/core/lib/support/stack_lockfree.h",
+      "src/core/lib/support/string.h",
+      "src/core/lib/support/string_windows.h",
+      "src/core/lib/support/thd_internal.h",
+      "src/core/lib/support/time_precise.h",
       "src/core/lib/support/tmpfile.h"
-    ], 
-    "language": "c", 
-    "name": "gpr_base", 
+    ],
+    "language": "c",
+    "name": "gpr_base",
     "src": [
-      "include/grpc/support/alloc.h", 
-      "include/grpc/support/atm.h", 
-      "include/grpc/support/atm_gcc_atomic.h", 
-      "include/grpc/support/atm_gcc_sync.h", 
-      "include/grpc/support/atm_win32.h", 
-      "include/grpc/support/avl.h", 
-      "include/grpc/support/cmdline.h", 
-      "include/grpc/support/cpu.h", 
-      "include/grpc/support/histogram.h", 
-      "include/grpc/support/host_port.h", 
-      "include/grpc/support/log.h", 
-      "include/grpc/support/log_win32.h", 
-      "include/grpc/support/port_platform.h", 
-      "include/grpc/support/slice.h", 
-      "include/grpc/support/slice_buffer.h", 
-      "include/grpc/support/string_util.h", 
-      "include/grpc/support/subprocess.h", 
-      "include/grpc/support/sync.h", 
-      "include/grpc/support/sync_generic.h", 
-      "include/grpc/support/sync_posix.h", 
-      "include/grpc/support/sync_win32.h", 
-      "include/grpc/support/thd.h", 
-      "include/grpc/support/time.h", 
-      "include/grpc/support/tls.h", 
-      "include/grpc/support/tls_gcc.h", 
-      "include/grpc/support/tls_msvc.h", 
-      "include/grpc/support/tls_pthread.h", 
-      "include/grpc/support/useful.h", 
-      "src/core/lib/profiling/basic_timers.c", 
-      "src/core/lib/profiling/stap_timers.c", 
-      "src/core/lib/profiling/timers.h", 
-      "src/core/lib/support/alloc.c", 
-      "src/core/lib/support/avl.c", 
-      "src/core/lib/support/backoff.c", 
-      "src/core/lib/support/backoff.h", 
-      "src/core/lib/support/block_annotate.h", 
-      "src/core/lib/support/cmdline.c", 
-      "src/core/lib/support/cpu_iphone.c", 
-      "src/core/lib/support/cpu_linux.c", 
-      "src/core/lib/support/cpu_posix.c", 
-      "src/core/lib/support/cpu_windows.c", 
-      "src/core/lib/support/env.h", 
-      "src/core/lib/support/env_linux.c", 
-      "src/core/lib/support/env_posix.c", 
-      "src/core/lib/support/env_win32.c", 
-      "src/core/lib/support/histogram.c", 
-      "src/core/lib/support/host_port.c", 
-      "src/core/lib/support/load_file.c", 
-      "src/core/lib/support/load_file.h", 
-      "src/core/lib/support/log.c", 
-      "src/core/lib/support/log_android.c", 
-      "src/core/lib/support/log_linux.c", 
-      "src/core/lib/support/log_posix.c", 
-      "src/core/lib/support/log_win32.c", 
-      "src/core/lib/support/murmur_hash.c", 
-      "src/core/lib/support/murmur_hash.h", 
-      "src/core/lib/support/slice.c", 
-      "src/core/lib/support/slice_buffer.c", 
-      "src/core/lib/support/stack_lockfree.c", 
-      "src/core/lib/support/stack_lockfree.h", 
-      "src/core/lib/support/string.c", 
-      "src/core/lib/support/string.h", 
-      "src/core/lib/support/string_posix.c", 
-      "src/core/lib/support/string_util_win32.c", 
-      "src/core/lib/support/string_win32.c", 
-      "src/core/lib/support/string_win32.h", 
-      "src/core/lib/support/subprocess_posix.c", 
-      "src/core/lib/support/subprocess_windows.c", 
-      "src/core/lib/support/sync.c", 
-      "src/core/lib/support/sync_posix.c", 
-      "src/core/lib/support/sync_win32.c", 
-      "src/core/lib/support/thd.c", 
-      "src/core/lib/support/thd_internal.h", 
-      "src/core/lib/support/thd_posix.c", 
-      "src/core/lib/support/thd_win32.c", 
-      "src/core/lib/support/time.c", 
-      "src/core/lib/support/time_posix.c", 
-      "src/core/lib/support/time_precise.c", 
-      "src/core/lib/support/time_precise.h", 
-      "src/core/lib/support/time_win32.c", 
-      "src/core/lib/support/tls_pthread.c", 
-      "src/core/lib/support/tmpfile.h", 
-      "src/core/lib/support/tmpfile_msys.c", 
-      "src/core/lib/support/tmpfile_posix.c", 
-      "src/core/lib/support/tmpfile_win32.c", 
+      "include/grpc/support/alloc.h",
+      "include/grpc/support/atm.h",
+      "include/grpc/support/atm_gcc_atomic.h",
+      "include/grpc/support/atm_gcc_sync.h",
+      "include/grpc/support/atm_windows.h",
+      "include/grpc/support/avl.h",
+      "include/grpc/support/cmdline.h",
+      "include/grpc/support/cpu.h",
+      "include/grpc/support/histogram.h",
+      "include/grpc/support/host_port.h",
+      "include/grpc/support/log.h",
+      "include/grpc/support/log_windows.h",
+      "include/grpc/support/port_platform.h",
+      "include/grpc/support/slice.h",
+      "include/grpc/support/slice_buffer.h",
+      "include/grpc/support/string_util.h",
+      "include/grpc/support/subprocess.h",
+      "include/grpc/support/sync.h",
+      "include/grpc/support/sync_generic.h",
+      "include/grpc/support/sync_posix.h",
+      "include/grpc/support/sync_windows.h",
+      "include/grpc/support/thd.h",
+      "include/grpc/support/time.h",
+      "include/grpc/support/tls.h",
+      "include/grpc/support/tls_gcc.h",
+      "include/grpc/support/tls_msvc.h",
+      "include/grpc/support/tls_pthread.h",
+      "include/grpc/support/useful.h",
+      "src/core/lib/profiling/basic_timers.c",
+      "src/core/lib/profiling/stap_timers.c",
+      "src/core/lib/profiling/timers.h",
+      "src/core/lib/support/alloc.c",
+      "src/core/lib/support/avl.c",
+      "src/core/lib/support/backoff.c",
+      "src/core/lib/support/backoff.h",
+      "src/core/lib/support/block_annotate.h",
+      "src/core/lib/support/cmdline.c",
+      "src/core/lib/support/cpu_iphone.c",
+      "src/core/lib/support/cpu_linux.c",
+      "src/core/lib/support/cpu_posix.c",
+      "src/core/lib/support/cpu_windows.c",
+      "src/core/lib/support/env.h",
+      "src/core/lib/support/env_linux.c",
+      "src/core/lib/support/env_posix.c",
+      "src/core/lib/support/env_windows.c",
+      "src/core/lib/support/histogram.c",
+      "src/core/lib/support/host_port.c",
+      "src/core/lib/support/load_file.c",
+      "src/core/lib/support/load_file.h",
+      "src/core/lib/support/log.c",
+      "src/core/lib/support/log_android.c",
+      "src/core/lib/support/log_linux.c",
+      "src/core/lib/support/log_posix.c",
+      "src/core/lib/support/log_windows.c",
+      "src/core/lib/support/murmur_hash.c",
+      "src/core/lib/support/murmur_hash.h",
+      "src/core/lib/support/slice.c",
+      "src/core/lib/support/slice_buffer.c",
+      "src/core/lib/support/stack_lockfree.c",
+      "src/core/lib/support/stack_lockfree.h",
+      "src/core/lib/support/string.c",
+      "src/core/lib/support/string.h",
+      "src/core/lib/support/string_posix.c",
+      "src/core/lib/support/string_util_windows.c",
+      "src/core/lib/support/string_windows.c",
+      "src/core/lib/support/string_windows.h",
+      "src/core/lib/support/subprocess_posix.c",
+      "src/core/lib/support/subprocess_windows.c",
+      "src/core/lib/support/sync.c",
+      "src/core/lib/support/sync_posix.c",
+      "src/core/lib/support/sync_windows.c",
+      "src/core/lib/support/thd.c",
+      "src/core/lib/support/thd_internal.h",
+      "src/core/lib/support/thd_posix.c",
+      "src/core/lib/support/thd_windows.c",
+      "src/core/lib/support/time.c",
+      "src/core/lib/support/time_posix.c",
+      "src/core/lib/support/time_precise.c",
+      "src/core/lib/support/time_precise.h",
+      "src/core/lib/support/time_windows.c",
+      "src/core/lib/support/tls_pthread.c",
+      "src/core/lib/support/tmpfile.h",
+      "src/core/lib/support/tmpfile_msys.c",
+      "src/core/lib/support/tmpfile_posix.c",
+      "src/core/lib/support/tmpfile_windows.c",
       "src/core/lib/support/wrap_memcpy.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "filegroup"
-  }, 
+  },
   {
-    "deps": [], 
+    "deps": [],
     "headers": [
-      "include/grpc/impl/codegen/alloc.h", 
-      "include/grpc/impl/codegen/atm.h", 
-      "include/grpc/impl/codegen/atm_gcc_atomic.h", 
-      "include/grpc/impl/codegen/atm_gcc_sync.h", 
-      "include/grpc/impl/codegen/atm_win32.h", 
-      "include/grpc/impl/codegen/log.h", 
-      "include/grpc/impl/codegen/port_platform.h", 
-      "include/grpc/impl/codegen/slice.h", 
-      "include/grpc/impl/codegen/slice_buffer.h", 
-      "include/grpc/impl/codegen/sync.h", 
-      "include/grpc/impl/codegen/sync_generic.h", 
-      "include/grpc/impl/codegen/sync_posix.h", 
-      "include/grpc/impl/codegen/sync_win32.h", 
+      "include/grpc/impl/codegen/alloc.h",
+      "include/grpc/impl/codegen/atm.h",
+      "include/grpc/impl/codegen/atm_gcc_atomic.h",
+      "include/grpc/impl/codegen/atm_gcc_sync.h",
+      "include/grpc/impl/codegen/atm_windows.h",
+      "include/grpc/impl/codegen/log.h",
+      "include/grpc/impl/codegen/port_platform.h",
+      "include/grpc/impl/codegen/slice.h",
+      "include/grpc/impl/codegen/slice_buffer.h",
+      "include/grpc/impl/codegen/sync.h",
+      "include/grpc/impl/codegen/sync_generic.h",
+      "include/grpc/impl/codegen/sync_posix.h",
+      "include/grpc/impl/codegen/sync_windows.h",
       "include/grpc/impl/codegen/time.h"
-    ], 
-    "language": "c", 
-    "name": "gpr_codegen", 
+    ],
+    "language": "c",
+    "name": "gpr_codegen",
     "src": [
-      "include/grpc/impl/codegen/alloc.h", 
-      "include/grpc/impl/codegen/atm.h", 
-      "include/grpc/impl/codegen/atm_gcc_atomic.h", 
-      "include/grpc/impl/codegen/atm_gcc_sync.h", 
-      "include/grpc/impl/codegen/atm_win32.h", 
-      "include/grpc/impl/codegen/log.h", 
-      "include/grpc/impl/codegen/port_platform.h", 
-      "include/grpc/impl/codegen/slice.h", 
-      "include/grpc/impl/codegen/slice_buffer.h", 
-      "include/grpc/impl/codegen/sync.h", 
-      "include/grpc/impl/codegen/sync_generic.h", 
-      "include/grpc/impl/codegen/sync_posix.h", 
-      "include/grpc/impl/codegen/sync_win32.h", 
+      "include/grpc/impl/codegen/alloc.h",
+      "include/grpc/impl/codegen/atm.h",
+      "include/grpc/impl/codegen/atm_gcc_atomic.h",
+      "include/grpc/impl/codegen/atm_gcc_sync.h",
+      "include/grpc/impl/codegen/atm_windows.h",
+      "include/grpc/impl/codegen/log.h",
+      "include/grpc/impl/codegen/port_platform.h",
+      "include/grpc/impl/codegen/slice.h",
+      "include/grpc/impl/codegen/slice_buffer.h",
+      "include/grpc/impl/codegen/sync.h",
+      "include/grpc/impl/codegen/sync_generic.h",
+      "include/grpc/impl/codegen/sync_posix.h",
+      "include/grpc/impl/codegen/sync_windows.h",
       "include/grpc/impl/codegen/time.h"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "filegroup"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
+      "gpr",
       "grpc_codegen"
-    ], 
+    ],
     "headers": [
-      "include/grpc/byte_buffer.h", 
-      "include/grpc/byte_buffer_reader.h", 
-      "include/grpc/compression.h", 
-      "include/grpc/grpc.h", 
-      "include/grpc/status.h", 
-      "src/core/lib/channel/channel_args.h", 
-      "src/core/lib/channel/channel_stack.h", 
-      "src/core/lib/channel/channel_stack_builder.h", 
-      "src/core/lib/channel/compress_filter.h", 
-      "src/core/lib/channel/connected_channel.h", 
-      "src/core/lib/channel/context.h", 
-      "src/core/lib/channel/http_client_filter.h", 
-      "src/core/lib/channel/http_server_filter.h", 
-      "src/core/lib/compression/algorithm_metadata.h", 
-      "src/core/lib/compression/message_compress.h", 
-      "src/core/lib/debug/trace.h", 
-      "src/core/lib/http/format_request.h", 
-      "src/core/lib/http/httpcli.h", 
-      "src/core/lib/http/parser.h", 
-      "src/core/lib/iomgr/closure.h", 
-      "src/core/lib/iomgr/endpoint.h", 
-      "src/core/lib/iomgr/endpoint_pair.h", 
-      "src/core/lib/iomgr/ev_poll_posix.h", 
-      "src/core/lib/iomgr/ev_posix.h", 
-      "src/core/lib/iomgr/exec_ctx.h", 
-      "src/core/lib/iomgr/executor.h", 
-      "src/core/lib/iomgr/iocp_windows.h", 
-      "src/core/lib/iomgr/iomgr.h", 
-      "src/core/lib/iomgr/iomgr_internal.h", 
-      "src/core/lib/iomgr/iomgr_posix.h", 
-      "src/core/lib/iomgr/pollset.h", 
-      "src/core/lib/iomgr/pollset_set.h", 
-      "src/core/lib/iomgr/pollset_set_windows.h", 
-      "src/core/lib/iomgr/pollset_windows.h", 
-      "src/core/lib/iomgr/resolve_address.h", 
-      "src/core/lib/iomgr/sockaddr.h", 
-      "src/core/lib/iomgr/sockaddr_posix.h", 
-      "src/core/lib/iomgr/sockaddr_utils.h", 
-      "src/core/lib/iomgr/sockaddr_win32.h", 
-      "src/core/lib/iomgr/socket_utils_posix.h", 
-      "src/core/lib/iomgr/socket_windows.h", 
-      "src/core/lib/iomgr/tcp_client.h", 
-      "src/core/lib/iomgr/tcp_posix.h", 
-      "src/core/lib/iomgr/tcp_server.h", 
-      "src/core/lib/iomgr/tcp_windows.h", 
-      "src/core/lib/iomgr/time_averaged_stats.h", 
-      "src/core/lib/iomgr/timer.h", 
-      "src/core/lib/iomgr/timer_heap.h", 
-      "src/core/lib/iomgr/udp_server.h", 
-      "src/core/lib/iomgr/unix_sockets_posix.h", 
-      "src/core/lib/iomgr/wakeup_fd_pipe.h", 
-      "src/core/lib/iomgr/wakeup_fd_posix.h", 
-      "src/core/lib/iomgr/workqueue.h", 
-      "src/core/lib/iomgr/workqueue_posix.h", 
-      "src/core/lib/iomgr/workqueue_windows.h", 
-      "src/core/lib/json/json.h", 
-      "src/core/lib/json/json_common.h", 
-      "src/core/lib/json/json_reader.h", 
-      "src/core/lib/json/json_writer.h", 
-      "src/core/lib/surface/api_trace.h", 
-      "src/core/lib/surface/call.h", 
-      "src/core/lib/surface/call_test_only.h", 
-      "src/core/lib/surface/channel.h", 
-      "src/core/lib/surface/channel_init.h", 
-      "src/core/lib/surface/channel_stack_type.h", 
-      "src/core/lib/surface/completion_queue.h", 
-      "src/core/lib/surface/event_string.h", 
-      "src/core/lib/surface/init.h", 
-      "src/core/lib/surface/lame_client.h", 
-      "src/core/lib/surface/server.h", 
-      "src/core/lib/surface/surface_trace.h", 
-      "src/core/lib/transport/byte_stream.h", 
-      "src/core/lib/transport/connectivity_state.h", 
-      "src/core/lib/transport/metadata.h", 
-      "src/core/lib/transport/metadata_batch.h", 
-      "src/core/lib/transport/static_metadata.h", 
-      "src/core/lib/transport/transport.h", 
+      "include/grpc/byte_buffer.h",
+      "include/grpc/byte_buffer_reader.h",
+      "include/grpc/compression.h",
+      "include/grpc/grpc.h",
+      "include/grpc/status.h",
+      "src/core/lib/channel/channel_args.h",
+      "src/core/lib/channel/channel_stack.h",
+      "src/core/lib/channel/channel_stack_builder.h",
+      "src/core/lib/channel/compress_filter.h",
+      "src/core/lib/channel/connected_channel.h",
+      "src/core/lib/channel/context.h",
+      "src/core/lib/channel/http_client_filter.h",
+      "src/core/lib/channel/http_server_filter.h",
+      "src/core/lib/compression/algorithm_metadata.h",
+      "src/core/lib/compression/message_compress.h",
+      "src/core/lib/debug/trace.h",
+      "src/core/lib/http/format_request.h",
+      "src/core/lib/http/httpcli.h",
+      "src/core/lib/http/parser.h",
+      "src/core/lib/iomgr/closure.h",
+      "src/core/lib/iomgr/endpoint.h",
+      "src/core/lib/iomgr/endpoint_pair.h",
+      "src/core/lib/iomgr/ev_poll_posix.h",
+      "src/core/lib/iomgr/ev_posix.h",
+      "src/core/lib/iomgr/exec_ctx.h",
+      "src/core/lib/iomgr/executor.h",
+      "src/core/lib/iomgr/iocp_windows.h",
+      "src/core/lib/iomgr/iomgr.h",
+      "src/core/lib/iomgr/iomgr_internal.h",
+      "src/core/lib/iomgr/iomgr_posix.h",
+      "src/core/lib/iomgr/pollset.h",
+      "src/core/lib/iomgr/pollset_set.h",
+      "src/core/lib/iomgr/pollset_set_windows.h",
+      "src/core/lib/iomgr/pollset_windows.h",
+      "src/core/lib/iomgr/resolve_address.h",
+      "src/core/lib/iomgr/sockaddr.h",
+      "src/core/lib/iomgr/sockaddr_posix.h",
+      "src/core/lib/iomgr/sockaddr_utils.h",
+      "src/core/lib/iomgr/sockaddr_windows.h",
+      "src/core/lib/iomgr/socket_utils_posix.h",
+      "src/core/lib/iomgr/socket_windows.h",
+      "src/core/lib/iomgr/tcp_client.h",
+      "src/core/lib/iomgr/tcp_posix.h",
+      "src/core/lib/iomgr/tcp_server.h",
+      "src/core/lib/iomgr/tcp_windows.h",
+      "src/core/lib/iomgr/time_averaged_stats.h",
+      "src/core/lib/iomgr/timer.h",
+      "src/core/lib/iomgr/timer_heap.h",
+      "src/core/lib/iomgr/udp_server.h",
+      "src/core/lib/iomgr/unix_sockets_posix.h",
+      "src/core/lib/iomgr/wakeup_fd_pipe.h",
+      "src/core/lib/iomgr/wakeup_fd_posix.h",
+      "src/core/lib/iomgr/workqueue.h",
+      "src/core/lib/iomgr/workqueue_posix.h",
+      "src/core/lib/iomgr/workqueue_windows.h",
+      "src/core/lib/json/json.h",
+      "src/core/lib/json/json_common.h",
+      "src/core/lib/json/json_reader.h",
+      "src/core/lib/json/json_writer.h",
+      "src/core/lib/surface/api_trace.h",
+      "src/core/lib/surface/call.h",
+      "src/core/lib/surface/call_test_only.h",
+      "src/core/lib/surface/channel.h",
+      "src/core/lib/surface/channel_init.h",
+      "src/core/lib/surface/channel_stack_type.h",
+      "src/core/lib/surface/completion_queue.h",
+      "src/core/lib/surface/event_string.h",
+      "src/core/lib/surface/init.h",
+      "src/core/lib/surface/lame_client.h",
+      "src/core/lib/surface/server.h",
+      "src/core/lib/surface/surface_trace.h",
+      "src/core/lib/transport/byte_stream.h",
+      "src/core/lib/transport/connectivity_state.h",
+      "src/core/lib/transport/metadata.h",
+      "src/core/lib/transport/metadata_batch.h",
+      "src/core/lib/transport/static_metadata.h",
+      "src/core/lib/transport/transport.h",
       "src/core/lib/transport/transport_impl.h"
-    ], 
-    "language": "c", 
-    "name": "grpc_base", 
+    ],
+    "language": "c",
+    "name": "grpc_base",
     "src": [
-      "include/grpc/byte_buffer.h", 
-      "include/grpc/byte_buffer_reader.h", 
-      "include/grpc/compression.h", 
-      "include/grpc/grpc.h", 
-      "include/grpc/status.h", 
-      "src/core/lib/channel/channel_args.c", 
-      "src/core/lib/channel/channel_args.h", 
-      "src/core/lib/channel/channel_stack.c", 
-      "src/core/lib/channel/channel_stack.h", 
-      "src/core/lib/channel/channel_stack_builder.c", 
-      "src/core/lib/channel/channel_stack_builder.h", 
-      "src/core/lib/channel/compress_filter.c", 
-      "src/core/lib/channel/compress_filter.h", 
-      "src/core/lib/channel/connected_channel.c", 
-      "src/core/lib/channel/connected_channel.h", 
-      "src/core/lib/channel/context.h", 
-      "src/core/lib/channel/http_client_filter.c", 
-      "src/core/lib/channel/http_client_filter.h", 
-      "src/core/lib/channel/http_server_filter.c", 
-      "src/core/lib/channel/http_server_filter.h", 
-      "src/core/lib/compression/algorithm_metadata.h", 
-      "src/core/lib/compression/compression_algorithm.c", 
-      "src/core/lib/compression/message_compress.c", 
-      "src/core/lib/compression/message_compress.h", 
-      "src/core/lib/debug/trace.c", 
-      "src/core/lib/debug/trace.h", 
-      "src/core/lib/http/format_request.c", 
-      "src/core/lib/http/format_request.h", 
-      "src/core/lib/http/httpcli.c", 
-      "src/core/lib/http/httpcli.h", 
-      "src/core/lib/http/parser.c", 
-      "src/core/lib/http/parser.h", 
-      "src/core/lib/iomgr/closure.c", 
-      "src/core/lib/iomgr/closure.h", 
-      "src/core/lib/iomgr/endpoint.c", 
-      "src/core/lib/iomgr/endpoint.h", 
-      "src/core/lib/iomgr/endpoint_pair.h", 
-      "src/core/lib/iomgr/endpoint_pair_posix.c", 
-      "src/core/lib/iomgr/endpoint_pair_windows.c", 
-      "src/core/lib/iomgr/ev_poll_posix.c", 
-      "src/core/lib/iomgr/ev_poll_posix.h", 
-      "src/core/lib/iomgr/ev_posix.c", 
-      "src/core/lib/iomgr/ev_posix.h", 
-      "src/core/lib/iomgr/exec_ctx.c", 
-      "src/core/lib/iomgr/exec_ctx.h", 
-      "src/core/lib/iomgr/executor.c", 
-      "src/core/lib/iomgr/executor.h", 
-      "src/core/lib/iomgr/iocp_windows.c", 
-      "src/core/lib/iomgr/iocp_windows.h", 
-      "src/core/lib/iomgr/iomgr.c", 
-      "src/core/lib/iomgr/iomgr.h", 
-      "src/core/lib/iomgr/iomgr_internal.h", 
-      "src/core/lib/iomgr/iomgr_posix.c", 
-      "src/core/lib/iomgr/iomgr_posix.h", 
-      "src/core/lib/iomgr/iomgr_windows.c", 
-      "src/core/lib/iomgr/pollset.h", 
-      "src/core/lib/iomgr/pollset_set.h", 
-      "src/core/lib/iomgr/pollset_set_windows.c", 
-      "src/core/lib/iomgr/pollset_set_windows.h", 
-      "src/core/lib/iomgr/pollset_windows.c", 
-      "src/core/lib/iomgr/pollset_windows.h", 
-      "src/core/lib/iomgr/resolve_address.h", 
-      "src/core/lib/iomgr/resolve_address_posix.c", 
-      "src/core/lib/iomgr/resolve_address_windows.c", 
-      "src/core/lib/iomgr/sockaddr.h", 
-      "src/core/lib/iomgr/sockaddr_posix.h", 
-      "src/core/lib/iomgr/sockaddr_utils.c", 
-      "src/core/lib/iomgr/sockaddr_utils.h", 
-      "src/core/lib/iomgr/sockaddr_win32.h", 
-      "src/core/lib/iomgr/socket_utils_common_posix.c", 
-      "src/core/lib/iomgr/socket_utils_linux.c", 
-      "src/core/lib/iomgr/socket_utils_posix.c", 
-      "src/core/lib/iomgr/socket_utils_posix.h", 
-      "src/core/lib/iomgr/socket_windows.c", 
-      "src/core/lib/iomgr/socket_windows.h", 
-      "src/core/lib/iomgr/tcp_client.h", 
-      "src/core/lib/iomgr/tcp_client_posix.c", 
-      "src/core/lib/iomgr/tcp_client_windows.c", 
-      "src/core/lib/iomgr/tcp_posix.c", 
-      "src/core/lib/iomgr/tcp_posix.h", 
-      "src/core/lib/iomgr/tcp_server.h", 
-      "src/core/lib/iomgr/tcp_server_posix.c", 
-      "src/core/lib/iomgr/tcp_server_windows.c", 
-      "src/core/lib/iomgr/tcp_windows.c", 
-      "src/core/lib/iomgr/tcp_windows.h", 
-      "src/core/lib/iomgr/time_averaged_stats.c", 
-      "src/core/lib/iomgr/time_averaged_stats.h", 
-      "src/core/lib/iomgr/timer.c", 
-      "src/core/lib/iomgr/timer.h", 
-      "src/core/lib/iomgr/timer_heap.c", 
-      "src/core/lib/iomgr/timer_heap.h", 
-      "src/core/lib/iomgr/udp_server.c", 
-      "src/core/lib/iomgr/udp_server.h", 
-      "src/core/lib/iomgr/unix_sockets_posix.c", 
-      "src/core/lib/iomgr/unix_sockets_posix.h", 
-      "src/core/lib/iomgr/unix_sockets_posix_noop.c", 
-      "src/core/lib/iomgr/wakeup_fd_eventfd.c", 
-      "src/core/lib/iomgr/wakeup_fd_nospecial.c", 
-      "src/core/lib/iomgr/wakeup_fd_pipe.c", 
-      "src/core/lib/iomgr/wakeup_fd_pipe.h", 
-      "src/core/lib/iomgr/wakeup_fd_posix.c", 
-      "src/core/lib/iomgr/wakeup_fd_posix.h", 
-      "src/core/lib/iomgr/workqueue.h", 
-      "src/core/lib/iomgr/workqueue_posix.c", 
-      "src/core/lib/iomgr/workqueue_posix.h", 
-      "src/core/lib/iomgr/workqueue_windows.c", 
-      "src/core/lib/iomgr/workqueue_windows.h", 
-      "src/core/lib/json/json.c", 
-      "src/core/lib/json/json.h", 
-      "src/core/lib/json/json_common.h", 
-      "src/core/lib/json/json_reader.c", 
-      "src/core/lib/json/json_reader.h", 
-      "src/core/lib/json/json_string.c", 
-      "src/core/lib/json/json_writer.c", 
-      "src/core/lib/json/json_writer.h", 
-      "src/core/lib/surface/alarm.c", 
-      "src/core/lib/surface/api_trace.c", 
-      "src/core/lib/surface/api_trace.h", 
-      "src/core/lib/surface/byte_buffer.c", 
-      "src/core/lib/surface/byte_buffer_reader.c", 
-      "src/core/lib/surface/call.c", 
-      "src/core/lib/surface/call.h", 
-      "src/core/lib/surface/call_details.c", 
-      "src/core/lib/surface/call_log_batch.c", 
-      "src/core/lib/surface/call_test_only.h", 
-      "src/core/lib/surface/channel.c", 
-      "src/core/lib/surface/channel.h", 
-      "src/core/lib/surface/channel_init.c", 
-      "src/core/lib/surface/channel_init.h", 
-      "src/core/lib/surface/channel_ping.c", 
-      "src/core/lib/surface/channel_stack_type.c", 
-      "src/core/lib/surface/channel_stack_type.h", 
-      "src/core/lib/surface/completion_queue.c", 
-      "src/core/lib/surface/completion_queue.h", 
-      "src/core/lib/surface/event_string.c", 
-      "src/core/lib/surface/event_string.h", 
-      "src/core/lib/surface/init.h", 
-      "src/core/lib/surface/lame_client.c", 
-      "src/core/lib/surface/lame_client.h", 
-      "src/core/lib/surface/metadata_array.c", 
-      "src/core/lib/surface/server.c", 
-      "src/core/lib/surface/server.h", 
-      "src/core/lib/surface/surface_trace.h", 
-      "src/core/lib/surface/validate_metadata.c", 
-      "src/core/lib/surface/version.c", 
-      "src/core/lib/transport/byte_stream.c", 
-      "src/core/lib/transport/byte_stream.h", 
-      "src/core/lib/transport/connectivity_state.c", 
-      "src/core/lib/transport/connectivity_state.h", 
-      "src/core/lib/transport/metadata.c", 
-      "src/core/lib/transport/metadata.h", 
-      "src/core/lib/transport/metadata_batch.c", 
-      "src/core/lib/transport/metadata_batch.h", 
-      "src/core/lib/transport/static_metadata.c", 
-      "src/core/lib/transport/static_metadata.h", 
-      "src/core/lib/transport/transport.c", 
-      "src/core/lib/transport/transport.h", 
-      "src/core/lib/transport/transport_impl.h", 
+      "include/grpc/byte_buffer.h",
+      "include/grpc/byte_buffer_reader.h",
+      "include/grpc/compression.h",
+      "include/grpc/grpc.h",
+      "include/grpc/status.h",
+      "src/core/lib/channel/channel_args.c",
+      "src/core/lib/channel/channel_args.h",
+      "src/core/lib/channel/channel_stack.c",
+      "src/core/lib/channel/channel_stack.h",
+      "src/core/lib/channel/channel_stack_builder.c",
+      "src/core/lib/channel/channel_stack_builder.h",
+      "src/core/lib/channel/compress_filter.c",
+      "src/core/lib/channel/compress_filter.h",
+      "src/core/lib/channel/connected_channel.c",
+      "src/core/lib/channel/connected_channel.h",
+      "src/core/lib/channel/context.h",
+      "src/core/lib/channel/http_client_filter.c",
+      "src/core/lib/channel/http_client_filter.h",
+      "src/core/lib/channel/http_server_filter.c",
+      "src/core/lib/channel/http_server_filter.h",
+      "src/core/lib/compression/algorithm_metadata.h",
+      "src/core/lib/compression/compression_algorithm.c",
+      "src/core/lib/compression/message_compress.c",
+      "src/core/lib/compression/message_compress.h",
+      "src/core/lib/debug/trace.c",
+      "src/core/lib/debug/trace.h",
+      "src/core/lib/http/format_request.c",
+      "src/core/lib/http/format_request.h",
+      "src/core/lib/http/httpcli.c",
+      "src/core/lib/http/httpcli.h",
+      "src/core/lib/http/parser.c",
+      "src/core/lib/http/parser.h",
+      "src/core/lib/iomgr/closure.c",
+      "src/core/lib/iomgr/closure.h",
+      "src/core/lib/iomgr/endpoint.c",
+      "src/core/lib/iomgr/endpoint.h",
+      "src/core/lib/iomgr/endpoint_pair.h",
+      "src/core/lib/iomgr/endpoint_pair_posix.c",
+      "src/core/lib/iomgr/endpoint_pair_windows.c",
+      "src/core/lib/iomgr/ev_poll_posix.c",
+      "src/core/lib/iomgr/ev_poll_posix.h",
+      "src/core/lib/iomgr/ev_posix.c",
+      "src/core/lib/iomgr/ev_posix.h",
+      "src/core/lib/iomgr/exec_ctx.c",
+      "src/core/lib/iomgr/exec_ctx.h",
+      "src/core/lib/iomgr/executor.c",
+      "src/core/lib/iomgr/executor.h",
+      "src/core/lib/iomgr/iocp_windows.c",
+      "src/core/lib/iomgr/iocp_windows.h",
+      "src/core/lib/iomgr/iomgr.c",
+      "src/core/lib/iomgr/iomgr.h",
+      "src/core/lib/iomgr/iomgr_internal.h",
+      "src/core/lib/iomgr/iomgr_posix.c",
+      "src/core/lib/iomgr/iomgr_posix.h",
+      "src/core/lib/iomgr/iomgr_windows.c",
+      "src/core/lib/iomgr/pollset.h",
+      "src/core/lib/iomgr/pollset_set.h",
+      "src/core/lib/iomgr/pollset_set_windows.c",
+      "src/core/lib/iomgr/pollset_set_windows.h",
+      "src/core/lib/iomgr/pollset_windows.c",
+      "src/core/lib/iomgr/pollset_windows.h",
+      "src/core/lib/iomgr/resolve_address.h",
+      "src/core/lib/iomgr/resolve_address_posix.c",
+      "src/core/lib/iomgr/resolve_address_windows.c",
+      "src/core/lib/iomgr/sockaddr.h",
+      "src/core/lib/iomgr/sockaddr_posix.h",
+      "src/core/lib/iomgr/sockaddr_utils.c",
+      "src/core/lib/iomgr/sockaddr_utils.h",
+      "src/core/lib/iomgr/sockaddr_windows.h",
+      "src/core/lib/iomgr/socket_utils_common_posix.c",
+      "src/core/lib/iomgr/socket_utils_linux.c",
+      "src/core/lib/iomgr/socket_utils_posix.c",
+      "src/core/lib/iomgr/socket_utils_posix.h",
+      "src/core/lib/iomgr/socket_windows.c",
+      "src/core/lib/iomgr/socket_windows.h",
+      "src/core/lib/iomgr/tcp_client.h",
+      "src/core/lib/iomgr/tcp_client_posix.c",
+      "src/core/lib/iomgr/tcp_client_windows.c",
+      "src/core/lib/iomgr/tcp_posix.c",
+      "src/core/lib/iomgr/tcp_posix.h",
+      "src/core/lib/iomgr/tcp_server.h",
+      "src/core/lib/iomgr/tcp_server_posix.c",
+      "src/core/lib/iomgr/tcp_server_windows.c",
+      "src/core/lib/iomgr/tcp_windows.c",
+      "src/core/lib/iomgr/tcp_windows.h",
+      "src/core/lib/iomgr/time_averaged_stats.c",
+      "src/core/lib/iomgr/time_averaged_stats.h",
+      "src/core/lib/iomgr/timer.c",
+      "src/core/lib/iomgr/timer.h",
+      "src/core/lib/iomgr/timer_heap.c",
+      "src/core/lib/iomgr/timer_heap.h",
+      "src/core/lib/iomgr/udp_server.c",
+      "src/core/lib/iomgr/udp_server.h",
+      "src/core/lib/iomgr/unix_sockets_posix.c",
+      "src/core/lib/iomgr/unix_sockets_posix.h",
+      "src/core/lib/iomgr/unix_sockets_posix_noop.c",
+      "src/core/lib/iomgr/wakeup_fd_eventfd.c",
+      "src/core/lib/iomgr/wakeup_fd_nospecial.c",
+      "src/core/lib/iomgr/wakeup_fd_pipe.c",
+      "src/core/lib/iomgr/wakeup_fd_pipe.h",
+      "src/core/lib/iomgr/wakeup_fd_posix.c",
+      "src/core/lib/iomgr/wakeup_fd_posix.h",
+      "src/core/lib/iomgr/workqueue.h",
+      "src/core/lib/iomgr/workqueue_posix.c",
+      "src/core/lib/iomgr/workqueue_posix.h",
+      "src/core/lib/iomgr/workqueue_windows.c",
+      "src/core/lib/iomgr/workqueue_windows.h",
+      "src/core/lib/json/json.c",
+      "src/core/lib/json/json.h",
+      "src/core/lib/json/json_common.h",
+      "src/core/lib/json/json_reader.c",
+      "src/core/lib/json/json_reader.h",
+      "src/core/lib/json/json_string.c",
+      "src/core/lib/json/json_writer.c",
+      "src/core/lib/json/json_writer.h",
+      "src/core/lib/surface/alarm.c",
+      "src/core/lib/surface/api_trace.c",
+      "src/core/lib/surface/api_trace.h",
+      "src/core/lib/surface/byte_buffer.c",
+      "src/core/lib/surface/byte_buffer_reader.c",
+      "src/core/lib/surface/call.c",
+      "src/core/lib/surface/call.h",
+      "src/core/lib/surface/call_details.c",
+      "src/core/lib/surface/call_log_batch.c",
+      "src/core/lib/surface/call_test_only.h",
+      "src/core/lib/surface/channel.c",
+      "src/core/lib/surface/channel.h",
+      "src/core/lib/surface/channel_init.c",
+      "src/core/lib/surface/channel_init.h",
+      "src/core/lib/surface/channel_ping.c",
+      "src/core/lib/surface/channel_stack_type.c",
+      "src/core/lib/surface/channel_stack_type.h",
+      "src/core/lib/surface/completion_queue.c",
+      "src/core/lib/surface/completion_queue.h",
+      "src/core/lib/surface/event_string.c",
+      "src/core/lib/surface/event_string.h",
+      "src/core/lib/surface/init.h",
+      "src/core/lib/surface/lame_client.c",
+      "src/core/lib/surface/lame_client.h",
+      "src/core/lib/surface/metadata_array.c",
+      "src/core/lib/surface/server.c",
+      "src/core/lib/surface/server.h",
+      "src/core/lib/surface/surface_trace.h",
+      "src/core/lib/surface/validate_metadata.c",
+      "src/core/lib/surface/version.c",
+      "src/core/lib/transport/byte_stream.c",
+      "src/core/lib/transport/byte_stream.h",
+      "src/core/lib/transport/connectivity_state.c",
+      "src/core/lib/transport/connectivity_state.h",
+      "src/core/lib/transport/metadata.c",
+      "src/core/lib/transport/metadata.h",
+      "src/core/lib/transport/metadata_batch.c",
+      "src/core/lib/transport/metadata_batch.h",
+      "src/core/lib/transport/static_metadata.c",
+      "src/core/lib/transport/static_metadata.h",
+      "src/core/lib/transport/transport.c",
+      "src/core/lib/transport/transport.h",
+      "src/core/lib/transport/transport_impl.h",
       "src/core/lib/transport/transport_op_string.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "filegroup"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
+      "gpr",
       "grpc_base"
-    ], 
+    ],
     "headers": [
-      "src/core/ext/client_config/client_channel.h", 
-      "src/core/ext/client_config/client_channel_factory.h", 
-      "src/core/ext/client_config/client_config.h", 
-      "src/core/ext/client_config/connector.h", 
-      "src/core/ext/client_config/initial_connect_string.h", 
-      "src/core/ext/client_config/lb_policy.h", 
-      "src/core/ext/client_config/lb_policy_factory.h", 
-      "src/core/ext/client_config/lb_policy_registry.h", 
-      "src/core/ext/client_config/parse_address.h", 
-      "src/core/ext/client_config/resolver.h", 
-      "src/core/ext/client_config/resolver_factory.h", 
-      "src/core/ext/client_config/resolver_registry.h", 
-      "src/core/ext/client_config/subchannel.h", 
-      "src/core/ext/client_config/subchannel_call_holder.h", 
-      "src/core/ext/client_config/subchannel_index.h", 
+      "src/core/ext/client_config/client_channel.h",
+      "src/core/ext/client_config/client_channel_factory.h",
+      "src/core/ext/client_config/client_config.h",
+      "src/core/ext/client_config/connector.h",
+      "src/core/ext/client_config/initial_connect_string.h",
+      "src/core/ext/client_config/lb_policy.h",
+      "src/core/ext/client_config/lb_policy_factory.h",
+      "src/core/ext/client_config/lb_policy_registry.h",
+      "src/core/ext/client_config/parse_address.h",
+      "src/core/ext/client_config/resolver.h",
+      "src/core/ext/client_config/resolver_factory.h",
+      "src/core/ext/client_config/resolver_registry.h",
+      "src/core/ext/client_config/subchannel.h",
+      "src/core/ext/client_config/subchannel_call_holder.h",
+      "src/core/ext/client_config/subchannel_index.h",
       "src/core/ext/client_config/uri_parser.h"
-    ], 
-    "language": "c", 
-    "name": "grpc_client_config", 
+    ],
+    "language": "c",
+    "name": "grpc_client_config",
     "src": [
-      "src/core/ext/client_config/channel_connectivity.c", 
-      "src/core/ext/client_config/client_channel.c", 
-      "src/core/ext/client_config/client_channel.h", 
-      "src/core/ext/client_config/client_channel_factory.c", 
-      "src/core/ext/client_config/client_channel_factory.h", 
-      "src/core/ext/client_config/client_config.c", 
-      "src/core/ext/client_config/client_config.h", 
-      "src/core/ext/client_config/client_config_plugin.c", 
-      "src/core/ext/client_config/connector.c", 
-      "src/core/ext/client_config/connector.h", 
-      "src/core/ext/client_config/default_initial_connect_string.c", 
-      "src/core/ext/client_config/initial_connect_string.c", 
-      "src/core/ext/client_config/initial_connect_string.h", 
-      "src/core/ext/client_config/lb_policy.c", 
-      "src/core/ext/client_config/lb_policy.h", 
-      "src/core/ext/client_config/lb_policy_factory.c", 
-      "src/core/ext/client_config/lb_policy_factory.h", 
-      "src/core/ext/client_config/lb_policy_registry.c", 
-      "src/core/ext/client_config/lb_policy_registry.h", 
-      "src/core/ext/client_config/parse_address.c", 
-      "src/core/ext/client_config/parse_address.h", 
-      "src/core/ext/client_config/resolver.c", 
-      "src/core/ext/client_config/resolver.h", 
-      "src/core/ext/client_config/resolver_factory.c", 
-      "src/core/ext/client_config/resolver_factory.h", 
-      "src/core/ext/client_config/resolver_registry.c", 
-      "src/core/ext/client_config/resolver_registry.h", 
-      "src/core/ext/client_config/subchannel.c", 
-      "src/core/ext/client_config/subchannel.h", 
-      "src/core/ext/client_config/subchannel_call_holder.c", 
-      "src/core/ext/client_config/subchannel_call_holder.h", 
-      "src/core/ext/client_config/subchannel_index.c", 
-      "src/core/ext/client_config/subchannel_index.h", 
-      "src/core/ext/client_config/uri_parser.c", 
+      "src/core/ext/client_config/channel_connectivity.c",
+      "src/core/ext/client_config/client_channel.c",
+      "src/core/ext/client_config/client_channel.h",
+      "src/core/ext/client_config/client_channel_factory.c",
+      "src/core/ext/client_config/client_channel_factory.h",
+      "src/core/ext/client_config/client_config.c",
+      "src/core/ext/client_config/client_config.h",
+      "src/core/ext/client_config/client_config_plugin.c",
+      "src/core/ext/client_config/connector.c",
+      "src/core/ext/client_config/connector.h",
+      "src/core/ext/client_config/default_initial_connect_string.c",
+      "src/core/ext/client_config/initial_connect_string.c",
+      "src/core/ext/client_config/initial_connect_string.h",
+      "src/core/ext/client_config/lb_policy.c",
+      "src/core/ext/client_config/lb_policy.h",
+      "src/core/ext/client_config/lb_policy_factory.c",
+      "src/core/ext/client_config/lb_policy_factory.h",
+      "src/core/ext/client_config/lb_policy_registry.c",
+      "src/core/ext/client_config/lb_policy_registry.h",
+      "src/core/ext/client_config/parse_address.c",
+      "src/core/ext/client_config/parse_address.h",
+      "src/core/ext/client_config/resolver.c",
+      "src/core/ext/client_config/resolver.h",
+      "src/core/ext/client_config/resolver_factory.c",
+      "src/core/ext/client_config/resolver_factory.h",
+      "src/core/ext/client_config/resolver_registry.c",
+      "src/core/ext/client_config/resolver_registry.h",
+      "src/core/ext/client_config/subchannel.c",
+      "src/core/ext/client_config/subchannel.h",
+      "src/core/ext/client_config/subchannel_call_holder.c",
+      "src/core/ext/client_config/subchannel_call_holder.h",
+      "src/core/ext/client_config/subchannel_index.c",
+      "src/core/ext/client_config/subchannel_index.h",
+      "src/core/ext/client_config/uri_parser.c",
       "src/core/ext/client_config/uri_parser.h"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "filegroup"
-  }, 
+  },
   {
     "deps": [
       "gpr_codegen"
-    ], 
+    ],
     "headers": [
-      "include/grpc/impl/codegen/byte_buffer.h", 
-      "include/grpc/impl/codegen/byte_buffer_reader.h", 
-      "include/grpc/impl/codegen/compression_types.h", 
-      "include/grpc/impl/codegen/connectivity_state.h", 
-      "include/grpc/impl/codegen/grpc_types.h", 
-      "include/grpc/impl/codegen/propagation_bits.h", 
+      "include/grpc/impl/codegen/byte_buffer.h",
+      "include/grpc/impl/codegen/byte_buffer_reader.h",
+      "include/grpc/impl/codegen/compression_types.h",
+      "include/grpc/impl/codegen/connectivity_state.h",
+      "include/grpc/impl/codegen/grpc_types.h",
+      "include/grpc/impl/codegen/propagation_bits.h",
       "include/grpc/impl/codegen/status.h"
-    ], 
-    "language": "c", 
-    "name": "grpc_codegen", 
+    ],
+    "language": "c",
+    "name": "grpc_codegen",
     "src": [
-      "include/grpc/impl/codegen/byte_buffer.h", 
-      "include/grpc/impl/codegen/byte_buffer_reader.h", 
-      "include/grpc/impl/codegen/compression_types.h", 
-      "include/grpc/impl/codegen/connectivity_state.h", 
-      "include/grpc/impl/codegen/grpc_types.h", 
-      "include/grpc/impl/codegen/propagation_bits.h", 
+      "include/grpc/impl/codegen/byte_buffer.h",
+      "include/grpc/impl/codegen/byte_buffer_reader.h",
+      "include/grpc/impl/codegen/compression_types.h",
+      "include/grpc/impl/codegen/connectivity_state.h",
+      "include/grpc/impl/codegen/grpc_types.h",
+      "include/grpc/impl/codegen/propagation_bits.h",
       "include/grpc/impl/codegen/status.h"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "filegroup"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "grpc_base", 
-      "grpc_client_config", 
+      "gpr",
+      "grpc_base",
+      "grpc_client_config",
       "nanopb"
-    ], 
+    ],
     "headers": [
-      "src/core/ext/lb_policy/grpclb/load_balancer_api.h", 
+      "src/core/ext/lb_policy/grpclb/load_balancer_api.h",
       "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h"
-    ], 
-    "language": "c", 
-    "name": "grpc_lb_policy_grpclb", 
+    ],
+    "language": "c",
+    "name": "grpc_lb_policy_grpclb",
     "src": [
-      "src/core/ext/lb_policy/grpclb/load_balancer_api.c", 
-      "src/core/ext/lb_policy/grpclb/load_balancer_api.h", 
-      "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c", 
+      "src/core/ext/lb_policy/grpclb/load_balancer_api.c",
+      "src/core/ext/lb_policy/grpclb/load_balancer_api.h",
+      "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c",
       "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "filegroup"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "grpc_base", 
+      "gpr",
+      "grpc_base",
       "grpc_client_config"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "grpc_lb_policy_pick_first", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "grpc_lb_policy_pick_first",
     "src": [
       "src/core/ext/lb_policy/pick_first/pick_first.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "filegroup"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "grpc_base", 
+      "gpr",
+      "grpc_base",
       "grpc_client_config"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "grpc_lb_policy_round_robin", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "grpc_lb_policy_round_robin",
     "src": [
       "src/core/ext/lb_policy/round_robin/round_robin.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "filegroup"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "grpc_base", 
+      "gpr",
+      "grpc_base",
       "grpc_client_config"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "grpc_resolver_dns_native", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "grpc_resolver_dns_native",
     "src": [
       "src/core/ext/resolver/dns/native/dns_resolver.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "filegroup"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "grpc_base", 
+      "gpr",
+      "grpc_base",
       "grpc_client_config"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "grpc_resolver_sockaddr", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "grpc_resolver_sockaddr",
     "src": [
       "src/core/ext/resolver/sockaddr/sockaddr_resolver.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "filegroup"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "grpc_base", 
-      "grpc_transport_chttp2_alpn", 
+      "gpr",
+      "grpc_base",
+      "grpc_transport_chttp2_alpn",
       "tsi"
-    ], 
+    ],
     "headers": [
-      "include/grpc/grpc_cronet.h", 
-      "include/grpc/grpc_security.h", 
-      "include/grpc/grpc_security_constants.h", 
-      "src/core/lib/security/context/security_context.h", 
-      "src/core/lib/security/credentials/composite/composite_credentials.h", 
-      "src/core/lib/security/credentials/credentials.h", 
-      "src/core/lib/security/credentials/fake/fake_credentials.h", 
-      "src/core/lib/security/credentials/google_default/google_default_credentials.h", 
-      "src/core/lib/security/credentials/iam/iam_credentials.h", 
-      "src/core/lib/security/credentials/jwt/json_token.h", 
-      "src/core/lib/security/credentials/jwt/jwt_credentials.h", 
-      "src/core/lib/security/credentials/jwt/jwt_verifier.h", 
-      "src/core/lib/security/credentials/oauth2/oauth2_credentials.h", 
-      "src/core/lib/security/credentials/plugin/plugin_credentials.h", 
-      "src/core/lib/security/credentials/ssl/ssl_credentials.h", 
-      "src/core/lib/security/transport/auth_filters.h", 
-      "src/core/lib/security/transport/handshake.h", 
-      "src/core/lib/security/transport/secure_endpoint.h", 
-      "src/core/lib/security/transport/security_connector.h", 
-      "src/core/lib/security/util/b64.h", 
+      "include/grpc/grpc_cronet.h",
+      "include/grpc/grpc_security.h",
+      "include/grpc/grpc_security_constants.h",
+      "src/core/lib/security/context/security_context.h",
+      "src/core/lib/security/credentials/composite/composite_credentials.h",
+      "src/core/lib/security/credentials/credentials.h",
+      "src/core/lib/security/credentials/fake/fake_credentials.h",
+      "src/core/lib/security/credentials/google_default/google_default_credentials.h",
+      "src/core/lib/security/credentials/iam/iam_credentials.h",
+      "src/core/lib/security/credentials/jwt/json_token.h",
+      "src/core/lib/security/credentials/jwt/jwt_credentials.h",
+      "src/core/lib/security/credentials/jwt/jwt_verifier.h",
+      "src/core/lib/security/credentials/oauth2/oauth2_credentials.h",
+      "src/core/lib/security/credentials/plugin/plugin_credentials.h",
+      "src/core/lib/security/credentials/ssl/ssl_credentials.h",
+      "src/core/lib/security/transport/auth_filters.h",
+      "src/core/lib/security/transport/handshake.h",
+      "src/core/lib/security/transport/secure_endpoint.h",
+      "src/core/lib/security/transport/security_connector.h",
+      "src/core/lib/security/util/b64.h",
       "src/core/lib/security/util/json_util.h"
-    ], 
-    "language": "c", 
-    "name": "grpc_secure", 
+    ],
+    "language": "c",
+    "name": "grpc_secure",
     "src": [
-      "include/grpc/grpc_cronet.h", 
-      "include/grpc/grpc_security.h", 
-      "include/grpc/grpc_security_constants.h", 
-      "src/core/lib/http/httpcli_security_connector.c", 
-      "src/core/lib/security/context/security_context.c", 
-      "src/core/lib/security/context/security_context.h", 
-      "src/core/lib/security/credentials/composite/composite_credentials.c", 
-      "src/core/lib/security/credentials/composite/composite_credentials.h", 
-      "src/core/lib/security/credentials/credentials.c", 
-      "src/core/lib/security/credentials/credentials.h", 
-      "src/core/lib/security/credentials/credentials_metadata.c", 
-      "src/core/lib/security/credentials/fake/fake_credentials.c", 
-      "src/core/lib/security/credentials/fake/fake_credentials.h", 
-      "src/core/lib/security/credentials/google_default/credentials_posix.c", 
-      "src/core/lib/security/credentials/google_default/credentials_win32.c", 
-      "src/core/lib/security/credentials/google_default/google_default_credentials.c", 
-      "src/core/lib/security/credentials/google_default/google_default_credentials.h", 
-      "src/core/lib/security/credentials/iam/iam_credentials.c", 
-      "src/core/lib/security/credentials/iam/iam_credentials.h", 
-      "src/core/lib/security/credentials/jwt/json_token.c", 
-      "src/core/lib/security/credentials/jwt/json_token.h", 
-      "src/core/lib/security/credentials/jwt/jwt_credentials.c", 
-      "src/core/lib/security/credentials/jwt/jwt_credentials.h", 
-      "src/core/lib/security/credentials/jwt/jwt_verifier.c", 
-      "src/core/lib/security/credentials/jwt/jwt_verifier.h", 
-      "src/core/lib/security/credentials/oauth2/oauth2_credentials.c", 
-      "src/core/lib/security/credentials/oauth2/oauth2_credentials.h", 
-      "src/core/lib/security/credentials/plugin/plugin_credentials.c", 
-      "src/core/lib/security/credentials/plugin/plugin_credentials.h", 
-      "src/core/lib/security/credentials/ssl/ssl_credentials.c", 
-      "src/core/lib/security/credentials/ssl/ssl_credentials.h", 
-      "src/core/lib/security/transport/auth_filters.h", 
-      "src/core/lib/security/transport/client_auth_filter.c", 
-      "src/core/lib/security/transport/handshake.c", 
-      "src/core/lib/security/transport/handshake.h", 
-      "src/core/lib/security/transport/secure_endpoint.c", 
-      "src/core/lib/security/transport/secure_endpoint.h", 
-      "src/core/lib/security/transport/security_connector.c", 
-      "src/core/lib/security/transport/security_connector.h", 
-      "src/core/lib/security/transport/server_auth_filter.c", 
-      "src/core/lib/security/util/b64.c", 
-      "src/core/lib/security/util/b64.h", 
-      "src/core/lib/security/util/json_util.c", 
-      "src/core/lib/security/util/json_util.h", 
+      "include/grpc/grpc_cronet.h",
+      "include/grpc/grpc_security.h",
+      "include/grpc/grpc_security_constants.h",
+      "src/core/lib/http/httpcli_security_connector.c",
+      "src/core/lib/security/context/security_context.c",
+      "src/core/lib/security/context/security_context.h",
+      "src/core/lib/security/credentials/composite/composite_credentials.c",
+      "src/core/lib/security/credentials/composite/composite_credentials.h",
+      "src/core/lib/security/credentials/credentials.c",
+      "src/core/lib/security/credentials/credentials.h",
+      "src/core/lib/security/credentials/credentials_metadata.c",
+      "src/core/lib/security/credentials/fake/fake_credentials.c",
+      "src/core/lib/security/credentials/fake/fake_credentials.h",
+      "src/core/lib/security/credentials/google_default/credentials_posix.c",
+      "src/core/lib/security/credentials/google_default/credentials_windows.c",
+      "src/core/lib/security/credentials/google_default/google_default_credentials.c",
+      "src/core/lib/security/credentials/google_default/google_default_credentials.h",
+      "src/core/lib/security/credentials/iam/iam_credentials.c",
+      "src/core/lib/security/credentials/iam/iam_credentials.h",
+      "src/core/lib/security/credentials/jwt/json_token.c",
+      "src/core/lib/security/credentials/jwt/json_token.h",
+      "src/core/lib/security/credentials/jwt/jwt_credentials.c",
+      "src/core/lib/security/credentials/jwt/jwt_credentials.h",
+      "src/core/lib/security/credentials/jwt/jwt_verifier.c",
+      "src/core/lib/security/credentials/jwt/jwt_verifier.h",
+      "src/core/lib/security/credentials/oauth2/oauth2_credentials.c",
+      "src/core/lib/security/credentials/oauth2/oauth2_credentials.h",
+      "src/core/lib/security/credentials/plugin/plugin_credentials.c",
+      "src/core/lib/security/credentials/plugin/plugin_credentials.h",
+      "src/core/lib/security/credentials/ssl/ssl_credentials.c",
+      "src/core/lib/security/credentials/ssl/ssl_credentials.h",
+      "src/core/lib/security/transport/auth_filters.h",
+      "src/core/lib/security/transport/client_auth_filter.c",
+      "src/core/lib/security/transport/handshake.c",
+      "src/core/lib/security/transport/handshake.h",
+      "src/core/lib/security/transport/secure_endpoint.c",
+      "src/core/lib/security/transport/secure_endpoint.h",
+      "src/core/lib/security/transport/security_connector.c",
+      "src/core/lib/security/transport/security_connector.h",
+      "src/core/lib/security/transport/server_auth_filter.c",
+      "src/core/lib/security/util/b64.c",
+      "src/core/lib/security/util/b64.h",
+      "src/core/lib/security/util/json_util.c",
+      "src/core/lib/security/util/json_util.h",
       "src/core/lib/surface/init_secure.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "filegroup"
-  }, 
+  },
   {
     "deps": [
-      "gpr_test_util", 
+      "gpr_test_util",
       "grpc"
-    ], 
+    ],
     "headers": [
-      "test/core/end2end/cq_verifier.h", 
-      "test/core/end2end/fixtures/proxy.h", 
-      "test/core/iomgr/endpoint_tests.h", 
-      "test/core/util/grpc_profiler.h", 
-      "test/core/util/memory_counters.h", 
-      "test/core/util/mock_endpoint.h", 
-      "test/core/util/parse_hexstring.h", 
-      "test/core/util/passthru_endpoint.h", 
-      "test/core/util/port.h", 
-      "test/core/util/port_server_client.h", 
+      "test/core/end2end/cq_verifier.h",
+      "test/core/end2end/fixtures/proxy.h",
+      "test/core/iomgr/endpoint_tests.h",
+      "test/core/util/grpc_profiler.h",
+      "test/core/util/memory_counters.h",
+      "test/core/util/mock_endpoint.h",
+      "test/core/util/parse_hexstring.h",
+      "test/core/util/passthru_endpoint.h",
+      "test/core/util/port.h",
+      "test/core/util/port_server_client.h",
       "test/core/util/slice_splitter.h"
-    ], 
-    "language": "c", 
-    "name": "grpc_test_util_base", 
+    ],
+    "language": "c",
+    "name": "grpc_test_util_base",
     "src": [
-      "test/core/end2end/cq_verifier.c", 
-      "test/core/end2end/cq_verifier.h", 
-      "test/core/end2end/fixtures/proxy.c", 
-      "test/core/end2end/fixtures/proxy.h", 
-      "test/core/iomgr/endpoint_tests.c", 
-      "test/core/iomgr/endpoint_tests.h", 
-      "test/core/util/grpc_profiler.c", 
-      "test/core/util/grpc_profiler.h", 
-      "test/core/util/memory_counters.c", 
-      "test/core/util/memory_counters.h", 
-      "test/core/util/mock_endpoint.c", 
-      "test/core/util/mock_endpoint.h", 
-      "test/core/util/parse_hexstring.c", 
-      "test/core/util/parse_hexstring.h", 
-      "test/core/util/passthru_endpoint.c", 
-      "test/core/util/passthru_endpoint.h", 
-      "test/core/util/port.h", 
-      "test/core/util/port_posix.c", 
-      "test/core/util/port_server_client.c", 
-      "test/core/util/port_server_client.h", 
-      "test/core/util/port_windows.c", 
-      "test/core/util/slice_splitter.c", 
+      "test/core/end2end/cq_verifier.c",
+      "test/core/end2end/cq_verifier.h",
+      "test/core/end2end/fixtures/proxy.c",
+      "test/core/end2end/fixtures/proxy.h",
+      "test/core/iomgr/endpoint_tests.c",
+      "test/core/iomgr/endpoint_tests.h",
+      "test/core/util/grpc_profiler.c",
+      "test/core/util/grpc_profiler.h",
+      "test/core/util/memory_counters.c",
+      "test/core/util/memory_counters.h",
+      "test/core/util/mock_endpoint.c",
+      "test/core/util/mock_endpoint.h",
+      "test/core/util/parse_hexstring.c",
+      "test/core/util/parse_hexstring.h",
+      "test/core/util/passthru_endpoint.c",
+      "test/core/util/passthru_endpoint.h",
+      "test/core/util/port.h",
+      "test/core/util/port_posix.c",
+      "test/core/util/port_server_client.c",
+      "test/core/util/port_server_client.h",
+      "test/core/util/port_windows.c",
+      "test/core/util/slice_splitter.c",
       "test/core/util/slice_splitter.h"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "filegroup"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "grpc_base", 
+      "gpr",
+      "grpc_base",
       "grpc_transport_chttp2_alpn"
-    ], 
+    ],
     "headers": [
-      "src/core/ext/transport/chttp2/transport/bin_encoder.h", 
-      "src/core/ext/transport/chttp2/transport/chttp2_transport.h", 
-      "src/core/ext/transport/chttp2/transport/frame.h", 
-      "src/core/ext/transport/chttp2/transport/frame_data.h", 
-      "src/core/ext/transport/chttp2/transport/frame_goaway.h", 
-      "src/core/ext/transport/chttp2/transport/frame_ping.h", 
-      "src/core/ext/transport/chttp2/transport/frame_rst_stream.h", 
-      "src/core/ext/transport/chttp2/transport/frame_settings.h", 
-      "src/core/ext/transport/chttp2/transport/frame_window_update.h", 
-      "src/core/ext/transport/chttp2/transport/hpack_encoder.h", 
-      "src/core/ext/transport/chttp2/transport/hpack_parser.h", 
-      "src/core/ext/transport/chttp2/transport/hpack_table.h", 
-      "src/core/ext/transport/chttp2/transport/http2_errors.h", 
-      "src/core/ext/transport/chttp2/transport/huffsyms.h", 
-      "src/core/ext/transport/chttp2/transport/incoming_metadata.h", 
-      "src/core/ext/transport/chttp2/transport/internal.h", 
-      "src/core/ext/transport/chttp2/transport/status_conversion.h", 
-      "src/core/ext/transport/chttp2/transport/stream_map.h", 
-      "src/core/ext/transport/chttp2/transport/timeout_encoding.h", 
+      "src/core/ext/transport/chttp2/transport/bin_encoder.h",
+      "src/core/ext/transport/chttp2/transport/chttp2_transport.h",
+      "src/core/ext/transport/chttp2/transport/frame.h",
+      "src/core/ext/transport/chttp2/transport/frame_data.h",
+      "src/core/ext/transport/chttp2/transport/frame_goaway.h",
+      "src/core/ext/transport/chttp2/transport/frame_ping.h",
+      "src/core/ext/transport/chttp2/transport/frame_rst_stream.h",
+      "src/core/ext/transport/chttp2/transport/frame_settings.h",
+      "src/core/ext/transport/chttp2/transport/frame_window_update.h",
+      "src/core/ext/transport/chttp2/transport/hpack_encoder.h",
+      "src/core/ext/transport/chttp2/transport/hpack_parser.h",
+      "src/core/ext/transport/chttp2/transport/hpack_table.h",
+      "src/core/ext/transport/chttp2/transport/http2_errors.h",
+      "src/core/ext/transport/chttp2/transport/huffsyms.h",
+      "src/core/ext/transport/chttp2/transport/incoming_metadata.h",
+      "src/core/ext/transport/chttp2/transport/internal.h",
+      "src/core/ext/transport/chttp2/transport/status_conversion.h",
+      "src/core/ext/transport/chttp2/transport/stream_map.h",
+      "src/core/ext/transport/chttp2/transport/timeout_encoding.h",
       "src/core/ext/transport/chttp2/transport/varint.h"
-    ], 
-    "language": "c", 
-    "name": "grpc_transport_chttp2", 
+    ],
+    "language": "c",
+    "name": "grpc_transport_chttp2",
     "src": [
-      "src/core/ext/transport/chttp2/transport/bin_encoder.c", 
-      "src/core/ext/transport/chttp2/transport/bin_encoder.h", 
-      "src/core/ext/transport/chttp2/transport/chttp2_plugin.c", 
-      "src/core/ext/transport/chttp2/transport/chttp2_transport.c", 
-      "src/core/ext/transport/chttp2/transport/chttp2_transport.h", 
-      "src/core/ext/transport/chttp2/transport/frame.h", 
-      "src/core/ext/transport/chttp2/transport/frame_data.c", 
-      "src/core/ext/transport/chttp2/transport/frame_data.h", 
-      "src/core/ext/transport/chttp2/transport/frame_goaway.c", 
-      "src/core/ext/transport/chttp2/transport/frame_goaway.h", 
-      "src/core/ext/transport/chttp2/transport/frame_ping.c", 
-      "src/core/ext/transport/chttp2/transport/frame_ping.h", 
-      "src/core/ext/transport/chttp2/transport/frame_rst_stream.c", 
-      "src/core/ext/transport/chttp2/transport/frame_rst_stream.h", 
-      "src/core/ext/transport/chttp2/transport/frame_settings.c", 
-      "src/core/ext/transport/chttp2/transport/frame_settings.h", 
-      "src/core/ext/transport/chttp2/transport/frame_window_update.c", 
-      "src/core/ext/transport/chttp2/transport/frame_window_update.h", 
-      "src/core/ext/transport/chttp2/transport/hpack_encoder.c", 
-      "src/core/ext/transport/chttp2/transport/hpack_encoder.h", 
-      "src/core/ext/transport/chttp2/transport/hpack_parser.c", 
-      "src/core/ext/transport/chttp2/transport/hpack_parser.h", 
-      "src/core/ext/transport/chttp2/transport/hpack_table.c", 
-      "src/core/ext/transport/chttp2/transport/hpack_table.h", 
-      "src/core/ext/transport/chttp2/transport/http2_errors.h", 
-      "src/core/ext/transport/chttp2/transport/huffsyms.c", 
-      "src/core/ext/transport/chttp2/transport/huffsyms.h", 
-      "src/core/ext/transport/chttp2/transport/incoming_metadata.c", 
-      "src/core/ext/transport/chttp2/transport/incoming_metadata.h", 
-      "src/core/ext/transport/chttp2/transport/internal.h", 
-      "src/core/ext/transport/chttp2/transport/parsing.c", 
-      "src/core/ext/transport/chttp2/transport/status_conversion.c", 
-      "src/core/ext/transport/chttp2/transport/status_conversion.h", 
-      "src/core/ext/transport/chttp2/transport/stream_lists.c", 
-      "src/core/ext/transport/chttp2/transport/stream_map.c", 
-      "src/core/ext/transport/chttp2/transport/stream_map.h", 
-      "src/core/ext/transport/chttp2/transport/timeout_encoding.c", 
-      "src/core/ext/transport/chttp2/transport/timeout_encoding.h", 
-      "src/core/ext/transport/chttp2/transport/varint.c", 
-      "src/core/ext/transport/chttp2/transport/varint.h", 
+      "src/core/ext/transport/chttp2/transport/bin_encoder.c",
+      "src/core/ext/transport/chttp2/transport/bin_encoder.h",
+      "src/core/ext/transport/chttp2/transport/chttp2_plugin.c",
+      "src/core/ext/transport/chttp2/transport/chttp2_transport.c",
+      "src/core/ext/transport/chttp2/transport/chttp2_transport.h",
+      "src/core/ext/transport/chttp2/transport/frame.h",
+      "src/core/ext/transport/chttp2/transport/frame_data.c",
+      "src/core/ext/transport/chttp2/transport/frame_data.h",
+      "src/core/ext/transport/chttp2/transport/frame_goaway.c",
+      "src/core/ext/transport/chttp2/transport/frame_goaway.h",
+      "src/core/ext/transport/chttp2/transport/frame_ping.c",
+      "src/core/ext/transport/chttp2/transport/frame_ping.h",
+      "src/core/ext/transport/chttp2/transport/frame_rst_stream.c",
+      "src/core/ext/transport/chttp2/transport/frame_rst_stream.h",
+      "src/core/ext/transport/chttp2/transport/frame_settings.c",
+      "src/core/ext/transport/chttp2/transport/frame_settings.h",
+      "src/core/ext/transport/chttp2/transport/frame_window_update.c",
+      "src/core/ext/transport/chttp2/transport/frame_window_update.h",
+      "src/core/ext/transport/chttp2/transport/hpack_encoder.c",
+      "src/core/ext/transport/chttp2/transport/hpack_encoder.h",
+      "src/core/ext/transport/chttp2/transport/hpack_parser.c",
+      "src/core/ext/transport/chttp2/transport/hpack_parser.h",
+      "src/core/ext/transport/chttp2/transport/hpack_table.c",
+      "src/core/ext/transport/chttp2/transport/hpack_table.h",
+      "src/core/ext/transport/chttp2/transport/http2_errors.h",
+      "src/core/ext/transport/chttp2/transport/huffsyms.c",
+      "src/core/ext/transport/chttp2/transport/huffsyms.h",
+      "src/core/ext/transport/chttp2/transport/incoming_metadata.c",
+      "src/core/ext/transport/chttp2/transport/incoming_metadata.h",
+      "src/core/ext/transport/chttp2/transport/internal.h",
+      "src/core/ext/transport/chttp2/transport/parsing.c",
+      "src/core/ext/transport/chttp2/transport/status_conversion.c",
+      "src/core/ext/transport/chttp2/transport/status_conversion.h",
+      "src/core/ext/transport/chttp2/transport/stream_lists.c",
+      "src/core/ext/transport/chttp2/transport/stream_map.c",
+      "src/core/ext/transport/chttp2/transport/stream_map.h",
+      "src/core/ext/transport/chttp2/transport/timeout_encoding.c",
+      "src/core/ext/transport/chttp2/transport/timeout_encoding.h",
+      "src/core/ext/transport/chttp2/transport/varint.c",
+      "src/core/ext/transport/chttp2/transport/varint.h",
       "src/core/ext/transport/chttp2/transport/writing.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "filegroup"
-  }, 
+  },
   {
     "deps": [
       "gpr"
-    ], 
+    ],
     "headers": [
       "src/core/ext/transport/chttp2/alpn/alpn.h"
-    ], 
-    "language": "c", 
-    "name": "grpc_transport_chttp2_alpn", 
+    ],
+    "language": "c",
+    "name": "grpc_transport_chttp2_alpn",
     "src": [
-      "src/core/ext/transport/chttp2/alpn/alpn.c", 
+      "src/core/ext/transport/chttp2/alpn/alpn.c",
       "src/core/ext/transport/chttp2/alpn/alpn.h"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "filegroup"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "grpc_base", 
-      "grpc_client_config", 
+      "gpr",
+      "grpc_base",
+      "grpc_client_config",
       "grpc_transport_chttp2"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "grpc_transport_chttp2_client_insecure", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "grpc_transport_chttp2_client_insecure",
     "src": [
       "src/core/ext/transport/chttp2/client/insecure/channel_create.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "filegroup"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "grpc_base", 
-      "grpc_client_config", 
-      "grpc_secure", 
+      "gpr",
+      "grpc_base",
+      "grpc_client_config",
+      "grpc_secure",
       "grpc_transport_chttp2"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "grpc_transport_chttp2_client_secure", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "grpc_transport_chttp2_client_secure",
     "src": [
       "src/core/ext/transport/chttp2/client/secure/secure_channel_create.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "filegroup"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "grpc_base", 
+      "gpr",
+      "grpc_base",
       "grpc_transport_chttp2"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "grpc_transport_chttp2_server_insecure", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "grpc_transport_chttp2_server_insecure",
     "src": [
       "src/core/ext/transport/chttp2/server/insecure/server_chttp2.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "filegroup"
-  }, 
+  },
   {
     "deps": [
-      "gpr", 
-      "grpc_base", 
-      "grpc_secure", 
+      "gpr",
+      "grpc_base",
+      "grpc_secure",
       "grpc_transport_chttp2"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "grpc_transport_chttp2_server_secure", 
+    ],
+    "headers": [],
+    "language": "c",
+    "name": "grpc_transport_chttp2_server_secure",
     "src": [
       "src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "filegroup"
-  }, 
+  },
   {
     "deps": [
-      "grpc_base", 
+      "grpc_base",
       "grpc_transport_chttp2"
-    ], 
+    ],
     "headers": [
       "third_party/objective_c/Cronet/cronet_c_for_grpc.h"
-    ], 
-    "language": "c", 
-    "name": "grpc_transport_cronet_client_secure", 
+    ],
+    "language": "c",
+    "name": "grpc_transport_cronet_client_secure",
     "src": [
-      "src/core/ext/transport/cronet/client/secure/cronet_channel_create.c", 
-      "src/core/ext/transport/cronet/transport/cronet_api_dummy.c", 
+      "src/core/ext/transport/cronet/client/secure/cronet_channel_create.c",
+      "src/core/ext/transport/cronet/transport/cronet_api_dummy.c",
       "src/core/ext/transport/cronet/transport/cronet_transport.c"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "filegroup"
-  }, 
+  },
   {
-    "deps": [], 
+    "deps": [],
     "headers": [
-      "third_party/nanopb/pb.h", 
-      "third_party/nanopb/pb_common.h", 
-      "third_party/nanopb/pb_decode.h", 
+      "third_party/nanopb/pb.h",
+      "third_party/nanopb/pb_common.h",
+      "third_party/nanopb/pb_decode.h",
       "third_party/nanopb/pb_encode.h"
-    ], 
-    "language": "c", 
-    "name": "nanopb", 
-    "src": [], 
-    "third_party": false, 
+    ],
+    "language": "c",
+    "name": "nanopb",
+    "src": [],
+    "third_party": false,
     "type": "filegroup"
-  }, 
+  },
   {
     "deps": [
       "gpr"
-    ], 
+    ],
     "headers": [
-      "src/core/lib/tsi/fake_transport_security.h", 
-      "src/core/lib/tsi/ssl_transport_security.h", 
-      "src/core/lib/tsi/ssl_types.h", 
-      "src/core/lib/tsi/transport_security.h", 
+      "src/core/lib/tsi/fake_transport_security.h",
+      "src/core/lib/tsi/ssl_transport_security.h",
+      "src/core/lib/tsi/ssl_types.h",
+      "src/core/lib/tsi/transport_security.h",
       "src/core/lib/tsi/transport_security_interface.h"
-    ], 
-    "language": "c", 
-    "name": "tsi", 
+    ],
+    "language": "c",
+    "name": "tsi",
     "src": [
-      "src/core/lib/tsi/fake_transport_security.c", 
-      "src/core/lib/tsi/fake_transport_security.h", 
-      "src/core/lib/tsi/ssl_transport_security.c", 
-      "src/core/lib/tsi/ssl_transport_security.h", 
-      "src/core/lib/tsi/ssl_types.h", 
-      "src/core/lib/tsi/transport_security.c", 
-      "src/core/lib/tsi/transport_security.h", 
+      "src/core/lib/tsi/fake_transport_security.c",
+      "src/core/lib/tsi/fake_transport_security.h",
+      "src/core/lib/tsi/ssl_transport_security.c",
+      "src/core/lib/tsi/ssl_transport_security.h",
+      "src/core/lib/tsi/ssl_types.h",
+      "src/core/lib/tsi/transport_security.c",
+      "src/core/lib/tsi/transport_security.h",
       "src/core/lib/tsi/transport_security_interface.h"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "filegroup"
-  }, 
+  },
   {
     "deps": [
-      "grpc", 
-      "grpc++_codegen", 
+      "grpc",
+      "grpc++_codegen",
       "grpc++_config"
-    ], 
+    ],
     "headers": [
-      "include/grpc++/alarm.h", 
-      "include/grpc++/channel.h", 
-      "include/grpc++/client_context.h", 
-      "include/grpc++/completion_queue.h", 
-      "include/grpc++/create_channel.h", 
-      "include/grpc++/generic/async_generic_service.h", 
-      "include/grpc++/generic/generic_stub.h", 
-      "include/grpc++/grpc++.h", 
-      "include/grpc++/impl/call.h", 
-      "include/grpc++/impl/client_unary_call.h", 
-      "include/grpc++/impl/grpc_library.h", 
-      "include/grpc++/impl/method_handler_impl.h", 
-      "include/grpc++/impl/proto_utils.h", 
-      "include/grpc++/impl/rpc_method.h", 
-      "include/grpc++/impl/rpc_service_method.h", 
-      "include/grpc++/impl/serialization_traits.h", 
-      "include/grpc++/impl/server_builder_option.h", 
-      "include/grpc++/impl/server_builder_plugin.h", 
-      "include/grpc++/impl/server_initializer.h", 
-      "include/grpc++/impl/service_type.h", 
-      "include/grpc++/impl/sync.h", 
-      "include/grpc++/impl/sync_cxx11.h", 
-      "include/grpc++/impl/sync_no_cxx11.h", 
-      "include/grpc++/impl/thd.h", 
-      "include/grpc++/impl/thd_cxx11.h", 
-      "include/grpc++/impl/thd_no_cxx11.h", 
-      "include/grpc++/security/auth_context.h", 
-      "include/grpc++/security/auth_metadata_processor.h", 
-      "include/grpc++/security/credentials.h", 
-      "include/grpc++/security/server_credentials.h", 
-      "include/grpc++/server.h", 
-      "include/grpc++/server_builder.h", 
-      "include/grpc++/server_context.h", 
-      "include/grpc++/support/async_stream.h", 
-      "include/grpc++/support/async_unary_call.h", 
-      "include/grpc++/support/byte_buffer.h", 
-      "include/grpc++/support/channel_arguments.h", 
-      "include/grpc++/support/slice.h", 
-      "include/grpc++/support/status.h", 
-      "include/grpc++/support/status_code_enum.h", 
-      "include/grpc++/support/string_ref.h", 
-      "include/grpc++/support/stub_options.h", 
-      "include/grpc++/support/sync_stream.h", 
-      "include/grpc++/support/time.h", 
-      "src/cpp/client/create_channel_internal.h", 
-      "src/cpp/common/core_codegen.h", 
-      "src/cpp/server/dynamic_thread_pool.h", 
+      "include/grpc++/alarm.h",
+      "include/grpc++/channel.h",
+      "include/grpc++/client_context.h",
+      "include/grpc++/completion_queue.h",
+      "include/grpc++/create_channel.h",
+      "include/grpc++/generic/async_generic_service.h",
+      "include/grpc++/generic/generic_stub.h",
+      "include/grpc++/grpc++.h",
+      "include/grpc++/impl/call.h",
+      "include/grpc++/impl/client_unary_call.h",
+      "include/grpc++/impl/grpc_library.h",
+      "include/grpc++/impl/method_handler_impl.h",
+      "include/grpc++/impl/proto_utils.h",
+      "include/grpc++/impl/rpc_method.h",
+      "include/grpc++/impl/rpc_service_method.h",
+      "include/grpc++/impl/serialization_traits.h",
+      "include/grpc++/impl/server_builder_option.h",
+      "include/grpc++/impl/server_builder_plugin.h",
+      "include/grpc++/impl/server_initializer.h",
+      "include/grpc++/impl/service_type.h",
+      "include/grpc++/impl/sync.h",
+      "include/grpc++/impl/sync_cxx11.h",
+      "include/grpc++/impl/sync_no_cxx11.h",
+      "include/grpc++/impl/thd.h",
+      "include/grpc++/impl/thd_cxx11.h",
+      "include/grpc++/impl/thd_no_cxx11.h",
+      "include/grpc++/security/auth_context.h",
+      "include/grpc++/security/auth_metadata_processor.h",
+      "include/grpc++/security/credentials.h",
+      "include/grpc++/security/server_credentials.h",
+      "include/grpc++/server.h",
+      "include/grpc++/server_builder.h",
+      "include/grpc++/server_context.h",
+      "include/grpc++/support/async_stream.h",
+      "include/grpc++/support/async_unary_call.h",
+      "include/grpc++/support/byte_buffer.h",
+      "include/grpc++/support/channel_arguments.h",
+      "include/grpc++/support/slice.h",
+      "include/grpc++/support/status.h",
+      "include/grpc++/support/status_code_enum.h",
+      "include/grpc++/support/string_ref.h",
+      "include/grpc++/support/stub_options.h",
+      "include/grpc++/support/sync_stream.h",
+      "include/grpc++/support/time.h",
+      "src/cpp/client/create_channel_internal.h",
+      "src/cpp/common/core_codegen.h",
+      "src/cpp/server/dynamic_thread_pool.h",
       "src/cpp/server/thread_pool_interface.h"
-    ], 
-    "language": "c++", 
-    "name": "grpc++_base", 
+    ],
+    "language": "c++",
+    "name": "grpc++_base",
     "src": [
-      "include/grpc++/alarm.h", 
-      "include/grpc++/channel.h", 
-      "include/grpc++/client_context.h", 
-      "include/grpc++/completion_queue.h", 
-      "include/grpc++/create_channel.h", 
-      "include/grpc++/generic/async_generic_service.h", 
-      "include/grpc++/generic/generic_stub.h", 
-      "include/grpc++/grpc++.h", 
-      "include/grpc++/impl/call.h", 
-      "include/grpc++/impl/client_unary_call.h", 
-      "include/grpc++/impl/grpc_library.h", 
-      "include/grpc++/impl/method_handler_impl.h", 
-      "include/grpc++/impl/proto_utils.h", 
-      "include/grpc++/impl/rpc_method.h", 
-      "include/grpc++/impl/rpc_service_method.h", 
-      "include/grpc++/impl/serialization_traits.h", 
-      "include/grpc++/impl/server_builder_option.h", 
-      "include/grpc++/impl/server_builder_plugin.h", 
-      "include/grpc++/impl/server_initializer.h", 
-      "include/grpc++/impl/service_type.h", 
-      "include/grpc++/impl/sync.h", 
-      "include/grpc++/impl/sync_cxx11.h", 
-      "include/grpc++/impl/sync_no_cxx11.h", 
-      "include/grpc++/impl/thd.h", 
-      "include/grpc++/impl/thd_cxx11.h", 
-      "include/grpc++/impl/thd_no_cxx11.h", 
-      "include/grpc++/security/auth_context.h", 
-      "include/grpc++/security/auth_metadata_processor.h", 
-      "include/grpc++/security/credentials.h", 
-      "include/grpc++/security/server_credentials.h", 
-      "include/grpc++/server.h", 
-      "include/grpc++/server_builder.h", 
-      "include/grpc++/server_context.h", 
-      "include/grpc++/support/async_stream.h", 
-      "include/grpc++/support/async_unary_call.h", 
-      "include/grpc++/support/byte_buffer.h", 
-      "include/grpc++/support/channel_arguments.h", 
-      "include/grpc++/support/slice.h", 
-      "include/grpc++/support/status.h", 
-      "include/grpc++/support/status_code_enum.h", 
-      "include/grpc++/support/string_ref.h", 
-      "include/grpc++/support/stub_options.h", 
-      "include/grpc++/support/sync_stream.h", 
-      "include/grpc++/support/time.h", 
-      "src/cpp/client/channel.cc", 
-      "src/cpp/client/client_context.cc", 
-      "src/cpp/client/create_channel.cc", 
-      "src/cpp/client/create_channel_internal.cc", 
-      "src/cpp/client/create_channel_internal.h", 
-      "src/cpp/client/credentials.cc", 
-      "src/cpp/client/generic_stub.cc", 
-      "src/cpp/client/insecure_credentials.cc", 
-      "src/cpp/common/channel_arguments.cc", 
-      "src/cpp/common/completion_queue.cc", 
-      "src/cpp/common/core_codegen.cc", 
-      "src/cpp/common/core_codegen.h", 
-      "src/cpp/common/rpc_method.cc", 
-      "src/cpp/server/async_generic_service.cc", 
-      "src/cpp/server/create_default_thread_pool.cc", 
-      "src/cpp/server/dynamic_thread_pool.cc", 
-      "src/cpp/server/dynamic_thread_pool.h", 
-      "src/cpp/server/insecure_server_credentials.cc", 
-      "src/cpp/server/server.cc", 
-      "src/cpp/server/server_builder.cc", 
-      "src/cpp/server/server_context.cc", 
-      "src/cpp/server/server_credentials.cc", 
-      "src/cpp/server/thread_pool_interface.h", 
-      "src/cpp/util/byte_buffer.cc", 
-      "src/cpp/util/slice.cc", 
-      "src/cpp/util/status.cc", 
-      "src/cpp/util/string_ref.cc", 
+      "include/grpc++/alarm.h",
+      "include/grpc++/channel.h",
+      "include/grpc++/client_context.h",
+      "include/grpc++/completion_queue.h",
+      "include/grpc++/create_channel.h",
+      "include/grpc++/generic/async_generic_service.h",
+      "include/grpc++/generic/generic_stub.h",
+      "include/grpc++/grpc++.h",
+      "include/grpc++/impl/call.h",
+      "include/grpc++/impl/client_unary_call.h",
+      "include/grpc++/impl/grpc_library.h",
+      "include/grpc++/impl/method_handler_impl.h",
+      "include/grpc++/impl/proto_utils.h",
+      "include/grpc++/impl/rpc_method.h",
+      "include/grpc++/impl/rpc_service_method.h",
+      "include/grpc++/impl/serialization_traits.h",
+      "include/grpc++/impl/server_builder_option.h",
+      "include/grpc++/impl/server_builder_plugin.h",
+      "include/grpc++/impl/server_initializer.h",
+      "include/grpc++/impl/service_type.h",
+      "include/grpc++/impl/sync.h",
+      "include/grpc++/impl/sync_cxx11.h",
+      "include/grpc++/impl/sync_no_cxx11.h",
+      "include/grpc++/impl/thd.h",
+      "include/grpc++/impl/thd_cxx11.h",
+      "include/grpc++/impl/thd_no_cxx11.h",
+      "include/grpc++/security/auth_context.h",
+      "include/grpc++/security/auth_metadata_processor.h",
+      "include/grpc++/security/credentials.h",
+      "include/grpc++/security/server_credentials.h",
+      "include/grpc++/server.h",
+      "include/grpc++/server_builder.h",
+      "include/grpc++/server_context.h",
+      "include/grpc++/support/async_stream.h",
+      "include/grpc++/support/async_unary_call.h",
+      "include/grpc++/support/byte_buffer.h",
+      "include/grpc++/support/channel_arguments.h",
+      "include/grpc++/support/slice.h",
+      "include/grpc++/support/status.h",
+      "include/grpc++/support/status_code_enum.h",
+      "include/grpc++/support/string_ref.h",
+      "include/grpc++/support/stub_options.h",
+      "include/grpc++/support/sync_stream.h",
+      "include/grpc++/support/time.h",
+      "src/cpp/client/channel.cc",
+      "src/cpp/client/client_context.cc",
+      "src/cpp/client/create_channel.cc",
+      "src/cpp/client/create_channel_internal.cc",
+      "src/cpp/client/create_channel_internal.h",
+      "src/cpp/client/credentials.cc",
+      "src/cpp/client/generic_stub.cc",
+      "src/cpp/client/insecure_credentials.cc",
+      "src/cpp/common/channel_arguments.cc",
+      "src/cpp/common/completion_queue.cc",
+      "src/cpp/common/core_codegen.cc",
+      "src/cpp/common/core_codegen.h",
+      "src/cpp/common/rpc_method.cc",
+      "src/cpp/server/async_generic_service.cc",
+      "src/cpp/server/create_default_thread_pool.cc",
+      "src/cpp/server/dynamic_thread_pool.cc",
+      "src/cpp/server/dynamic_thread_pool.h",
+      "src/cpp/server/insecure_server_credentials.cc",
+      "src/cpp/server/server.cc",
+      "src/cpp/server/server_builder.cc",
+      "src/cpp/server/server_context.cc",
+      "src/cpp/server/server_credentials.cc",
+      "src/cpp/server/thread_pool_interface.h",
+      "src/cpp/util/byte_buffer.cc",
+      "src/cpp/util/slice.cc",
+      "src/cpp/util/status.cc",
+      "src/cpp/util/string_ref.cc",
       "src/cpp/util/time.cc"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "filegroup"
-  }, 
+  },
   {
     "deps": [
-      "grpc++_config_codegen", 
+      "grpc++_config_codegen",
       "grpc_codegen"
-    ], 
+    ],
     "headers": [
-      "include/grpc++/impl/codegen/async_stream.h", 
-      "include/grpc++/impl/codegen/async_unary_call.h", 
-      "include/grpc++/impl/codegen/call.h", 
-      "include/grpc++/impl/codegen/call_hook.h", 
-      "include/grpc++/impl/codegen/channel_interface.h", 
-      "include/grpc++/impl/codegen/client_context.h", 
-      "include/grpc++/impl/codegen/client_unary_call.h", 
-      "include/grpc++/impl/codegen/completion_queue.h", 
-      "include/grpc++/impl/codegen/completion_queue_tag.h", 
-      "include/grpc++/impl/codegen/core_codegen_interface.h", 
-      "include/grpc++/impl/codegen/create_auth_context.h", 
-      "include/grpc++/impl/codegen/grpc_library.h", 
-      "include/grpc++/impl/codegen/method_handler_impl.h", 
-      "include/grpc++/impl/codegen/proto_utils.h", 
-      "include/grpc++/impl/codegen/rpc_method.h", 
-      "include/grpc++/impl/codegen/rpc_service_method.h", 
-      "include/grpc++/impl/codegen/security/auth_context.h", 
-      "include/grpc++/impl/codegen/serialization_traits.h", 
-      "include/grpc++/impl/codegen/server_context.h", 
-      "include/grpc++/impl/codegen/server_interface.h", 
-      "include/grpc++/impl/codegen/service_type.h", 
-      "include/grpc++/impl/codegen/status.h", 
-      "include/grpc++/impl/codegen/status_code_enum.h", 
-      "include/grpc++/impl/codegen/string_ref.h", 
-      "include/grpc++/impl/codegen/stub_options.h", 
-      "include/grpc++/impl/codegen/sync.h", 
-      "include/grpc++/impl/codegen/sync_cxx11.h", 
-      "include/grpc++/impl/codegen/sync_no_cxx11.h", 
-      "include/grpc++/impl/codegen/sync_stream.h", 
+      "include/grpc++/impl/codegen/async_stream.h",
+      "include/grpc++/impl/codegen/async_unary_call.h",
+      "include/grpc++/impl/codegen/call.h",
+      "include/grpc++/impl/codegen/call_hook.h",
+      "include/grpc++/impl/codegen/channel_interface.h",
+      "include/grpc++/impl/codegen/client_context.h",
+      "include/grpc++/impl/codegen/client_unary_call.h",
+      "include/grpc++/impl/codegen/completion_queue.h",
+      "include/grpc++/impl/codegen/completion_queue_tag.h",
+      "include/grpc++/impl/codegen/core_codegen_interface.h",
+      "include/grpc++/impl/codegen/create_auth_context.h",
+      "include/grpc++/impl/codegen/grpc_library.h",
+      "include/grpc++/impl/codegen/method_handler_impl.h",
+      "include/grpc++/impl/codegen/proto_utils.h",
+      "include/grpc++/impl/codegen/rpc_method.h",
+      "include/grpc++/impl/codegen/rpc_service_method.h",
+      "include/grpc++/impl/codegen/security/auth_context.h",
+      "include/grpc++/impl/codegen/serialization_traits.h",
+      "include/grpc++/impl/codegen/server_context.h",
+      "include/grpc++/impl/codegen/server_interface.h",
+      "include/grpc++/impl/codegen/service_type.h",
+      "include/grpc++/impl/codegen/status.h",
+      "include/grpc++/impl/codegen/status_code_enum.h",
+      "include/grpc++/impl/codegen/string_ref.h",
+      "include/grpc++/impl/codegen/stub_options.h",
+      "include/grpc++/impl/codegen/sync.h",
+      "include/grpc++/impl/codegen/sync_cxx11.h",
+      "include/grpc++/impl/codegen/sync_no_cxx11.h",
+      "include/grpc++/impl/codegen/sync_stream.h",
       "include/grpc++/impl/codegen/time.h"
-    ], 
-    "language": "c++", 
-    "name": "grpc++_codegen", 
+    ],
+    "language": "c++",
+    "name": "grpc++_codegen",
     "src": [
-      "include/grpc++/impl/codegen/async_stream.h", 
-      "include/grpc++/impl/codegen/async_unary_call.h", 
-      "include/grpc++/impl/codegen/call.h", 
-      "include/grpc++/impl/codegen/call_hook.h", 
-      "include/grpc++/impl/codegen/channel_interface.h", 
-      "include/grpc++/impl/codegen/client_context.h", 
-      "include/grpc++/impl/codegen/client_unary_call.h", 
-      "include/grpc++/impl/codegen/completion_queue.h", 
-      "include/grpc++/impl/codegen/completion_queue_tag.h", 
-      "include/grpc++/impl/codegen/core_codegen_interface.h", 
-      "include/grpc++/impl/codegen/create_auth_context.h", 
-      "include/grpc++/impl/codegen/grpc_library.h", 
-      "include/grpc++/impl/codegen/method_handler_impl.h", 
-      "include/grpc++/impl/codegen/proto_utils.h", 
-      "include/grpc++/impl/codegen/rpc_method.h", 
-      "include/grpc++/impl/codegen/rpc_service_method.h", 
-      "include/grpc++/impl/codegen/security/auth_context.h", 
-      "include/grpc++/impl/codegen/serialization_traits.h", 
-      "include/grpc++/impl/codegen/server_context.h", 
-      "include/grpc++/impl/codegen/server_interface.h", 
-      "include/grpc++/impl/codegen/service_type.h", 
-      "include/grpc++/impl/codegen/status.h", 
-      "include/grpc++/impl/codegen/status_code_enum.h", 
-      "include/grpc++/impl/codegen/string_ref.h", 
-      "include/grpc++/impl/codegen/stub_options.h", 
-      "include/grpc++/impl/codegen/sync.h", 
-      "include/grpc++/impl/codegen/sync_cxx11.h", 
-      "include/grpc++/impl/codegen/sync_no_cxx11.h", 
-      "include/grpc++/impl/codegen/sync_stream.h", 
-      "include/grpc++/impl/codegen/time.h", 
+      "include/grpc++/impl/codegen/async_stream.h",
+      "include/grpc++/impl/codegen/async_unary_call.h",
+      "include/grpc++/impl/codegen/call.h",
+      "include/grpc++/impl/codegen/call_hook.h",
+      "include/grpc++/impl/codegen/channel_interface.h",
+      "include/grpc++/impl/codegen/client_context.h",
+      "include/grpc++/impl/codegen/client_unary_call.h",
+      "include/grpc++/impl/codegen/completion_queue.h",
+      "include/grpc++/impl/codegen/completion_queue_tag.h",
+      "include/grpc++/impl/codegen/core_codegen_interface.h",
+      "include/grpc++/impl/codegen/create_auth_context.h",
+      "include/grpc++/impl/codegen/grpc_library.h",
+      "include/grpc++/impl/codegen/method_handler_impl.h",
+      "include/grpc++/impl/codegen/proto_utils.h",
+      "include/grpc++/impl/codegen/rpc_method.h",
+      "include/grpc++/impl/codegen/rpc_service_method.h",
+      "include/grpc++/impl/codegen/security/auth_context.h",
+      "include/grpc++/impl/codegen/serialization_traits.h",
+      "include/grpc++/impl/codegen/server_context.h",
+      "include/grpc++/impl/codegen/server_interface.h",
+      "include/grpc++/impl/codegen/service_type.h",
+      "include/grpc++/impl/codegen/status.h",
+      "include/grpc++/impl/codegen/status_code_enum.h",
+      "include/grpc++/impl/codegen/string_ref.h",
+      "include/grpc++/impl/codegen/stub_options.h",
+      "include/grpc++/impl/codegen/sync.h",
+      "include/grpc++/impl/codegen/sync_cxx11.h",
+      "include/grpc++/impl/codegen/sync_no_cxx11.h",
+      "include/grpc++/impl/codegen/sync_stream.h",
+      "include/grpc++/impl/codegen/time.h",
       "src/cpp/codegen/codegen_init.cc"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "filegroup"
-  }, 
+  },
   {
     "deps": [
       "grpc++_config_codegen"
-    ], 
+    ],
     "headers": [
-      "include/grpc++/support/config.h", 
+      "include/grpc++/support/config.h",
       "include/grpc++/support/config_protobuf.h"
-    ], 
-    "language": "c++", 
-    "name": "grpc++_config", 
+    ],
+    "language": "c++",
+    "name": "grpc++_config",
     "src": [
-      "include/grpc++/support/config.h", 
+      "include/grpc++/support/config.h",
       "include/grpc++/support/config_protobuf.h"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "filegroup"
-  }, 
+  },
   {
-    "deps": [], 
+    "deps": [],
     "headers": [
-      "include/grpc++/impl/codegen/config.h", 
+      "include/grpc++/impl/codegen/config.h",
       "include/grpc++/impl/codegen/config_protobuf.h"
-    ], 
-    "language": "c++", 
-    "name": "grpc++_config_codegen", 
+    ],
+    "language": "c++",
+    "name": "grpc++_config_codegen",
     "src": [
-      "include/grpc++/impl/codegen/config.h", 
+      "include/grpc++/impl/codegen/config.h",
       "include/grpc++/impl/codegen/config_protobuf.h"
-    ], 
-    "third_party": false, 
+    ],
+    "third_party": false,
     "type": "filegroup"
   }
 ]
diff --git a/vsprojects/coapp/openssl/libeay32.vcxproj b/vsprojects/coapp/openssl/libeay32.vcxproj
index ea63162..46ddbde 100644
--- a/vsprojects/coapp/openssl/libeay32.vcxproj
+++ b/vsprojects/coapp/openssl/libeay32.vcxproj
@@ -609,7 +609,7 @@
     <ClCompile Include="$(OpenSslPath)\crypto\dso\dso_err.c" />
     <ClCompile Include="$(OpenSslPath)\crypto\dso\dso_dlfcn.c" />
     <ClCompile Include="$(OpenSslPath)\crypto\dso\dso_lib.c" />
-    <ClCompile Include="$(OpenSslPath)\crypto\dso\dso_win32.c" />
+    <ClCompile Include="$(OpenSslPath)\crypto\dso\dso_windows.c" />
     <ClCompile Include="$(OpenSslPath)\crypto\stack\stack.c" />
     <ClCompile Include="$(OpenSslPath)\crypto\md4\md4_dgst.c" />
     <ClCompile Include="$(OpenSslPath)\crypto\md4\md4_one.c" />
diff --git a/vsprojects/vcxproj/gpr/gpr.vcxproj b/vsprojects/vcxproj/gpr/gpr.vcxproj
index 26195bb..fadb55f 100644
--- a/vsprojects/vcxproj/gpr/gpr.vcxproj
+++ b/vsprojects/vcxproj/gpr/gpr.vcxproj
@@ -151,14 +151,14 @@
     <ClInclude Include="$(SolutionDir)\..\include\grpc\support\atm.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\support\atm_gcc_atomic.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\support\atm_gcc_sync.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\atm_win32.h" />
+    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\atm_windows.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\support\avl.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\support\cmdline.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\support\cpu.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\support\histogram.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\support\host_port.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\support\log.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\log_win32.h" />
+    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\log_windows.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\support\port_platform.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\support\slice.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\support\slice_buffer.h" />
@@ -167,7 +167,7 @@
     <ClInclude Include="$(SolutionDir)\..\include\grpc\support\sync.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\support\sync_generic.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\support\sync_posix.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\sync_win32.h" />
+    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\sync_windows.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\support\thd.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\support\time.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\support\tls.h" />
@@ -179,7 +179,7 @@
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_gcc_atomic.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_gcc_sync.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_win32.h" />
+    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_windows.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\log.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\port_platform.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\slice.h" />
@@ -187,7 +187,7 @@
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_generic.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_posix.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_win32.h" />
+    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_windows.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\time.h" />
   </ItemGroup>
   <ItemGroup>
@@ -199,7 +199,7 @@
     <ClInclude Include="$(SolutionDir)\..\src\core\lib\support\murmur_hash.h" />
     <ClInclude Include="$(SolutionDir)\..\src\core\lib\support\stack_lockfree.h" />
     <ClInclude Include="$(SolutionDir)\..\src\core\lib\support\string.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\support\string_win32.h" />
+    <ClInclude Include="$(SolutionDir)\..\src\core\lib\support\string_windows.h" />
     <ClInclude Include="$(SolutionDir)\..\src\core\lib\support\thd_internal.h" />
     <ClInclude Include="$(SolutionDir)\..\src\core\lib\support\time_precise.h" />
     <ClInclude Include="$(SolutionDir)\..\src\core\lib\support\tmpfile.h" />
@@ -229,7 +229,7 @@
     </ClCompile>
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\env_posix.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\env_win32.c">
+    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\env_windows.c">
     </ClCompile>
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\histogram.c">
     </ClCompile>
@@ -245,7 +245,7 @@
     </ClCompile>
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\log_posix.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\log_win32.c">
+    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\log_windows.c">
     </ClCompile>
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\murmur_hash.c">
     </ClCompile>
@@ -259,9 +259,9 @@
     </ClCompile>
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\string_posix.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\string_util_win32.c">
+    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\string_util_windows.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\string_win32.c">
+    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\string_windows.c">
     </ClCompile>
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\subprocess_posix.c">
     </ClCompile>
@@ -271,13 +271,13 @@
     </ClCompile>
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\sync_posix.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\sync_win32.c">
+    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\sync_windows.c">
     </ClCompile>
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\thd.c">
     </ClCompile>
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\thd_posix.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\thd_win32.c">
+    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\thd_windows.c">
     </ClCompile>
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\time.c">
     </ClCompile>
@@ -285,7 +285,7 @@
     </ClCompile>
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\time_precise.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\time_win32.c">
+    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\time_windows.c">
     </ClCompile>
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\tls_pthread.c">
     </ClCompile>
@@ -293,7 +293,7 @@
     </ClCompile>
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\tmpfile_posix.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\tmpfile_win32.c">
+    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\tmpfile_windows.c">
     </ClCompile>
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\wrap_memcpy.c">
     </ClCompile>
@@ -307,4 +307,3 @@
     </PropertyGroup>
   </Target>
 </Project>
-
diff --git a/vsprojects/vcxproj/gpr/gpr.vcxproj.filters b/vsprojects/vcxproj/gpr/gpr.vcxproj.filters
index be15391..0e59501 100644
--- a/vsprojects/vcxproj/gpr/gpr.vcxproj.filters
+++ b/vsprojects/vcxproj/gpr/gpr.vcxproj.filters
@@ -37,7 +37,7 @@
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\env_posix.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\env_win32.c">
+    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\env_windows.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\histogram.c">
@@ -61,7 +61,7 @@
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\log_posix.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\log_win32.c">
+    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\log_windows.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\murmur_hash.c">
@@ -82,10 +82,10 @@
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\string_posix.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\string_util_win32.c">
+    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\string_util_windows.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\string_win32.c">
+    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\string_windows.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\subprocess_posix.c">
@@ -100,7 +100,7 @@
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\sync_posix.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\sync_win32.c">
+    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\sync_windows.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\thd.c">
@@ -109,7 +109,7 @@
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\thd_posix.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\thd_win32.c">
+    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\thd_windows.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\time.c">
@@ -121,7 +121,7 @@
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\time_precise.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\time_win32.c">
+    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\time_windows.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\tls_pthread.c">
@@ -133,7 +133,7 @@
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\tmpfile_posix.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\tmpfile_win32.c">
+    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\tmpfile_windows.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\wrap_memcpy.c">
@@ -153,7 +153,7 @@
     <ClInclude Include="$(SolutionDir)\..\include\grpc\support\atm_gcc_sync.h">
       <Filter>include\grpc\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\atm_win32.h">
+    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\atm_windows.h">
       <Filter>include\grpc\support</Filter>
     </ClInclude>
     <ClInclude Include="$(SolutionDir)\..\include\grpc\support\avl.h">
@@ -174,7 +174,7 @@
     <ClInclude Include="$(SolutionDir)\..\include\grpc\support\log.h">
       <Filter>include\grpc\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\log_win32.h">
+    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\log_windows.h">
       <Filter>include\grpc\support</Filter>
     </ClInclude>
     <ClInclude Include="$(SolutionDir)\..\include\grpc\support\port_platform.h">
@@ -201,7 +201,7 @@
     <ClInclude Include="$(SolutionDir)\..\include\grpc\support\sync_posix.h">
       <Filter>include\grpc\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\sync_win32.h">
+    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\sync_windows.h">
       <Filter>include\grpc\support</Filter>
     </ClInclude>
     <ClInclude Include="$(SolutionDir)\..\include\grpc\support\thd.h">
@@ -237,7 +237,7 @@
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_gcc_sync.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_win32.h">
+    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_windows.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\log.h">
@@ -261,7 +261,7 @@
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_posix.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_win32.h">
+    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_windows.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\time.h">
@@ -293,7 +293,7 @@
     <ClInclude Include="$(SolutionDir)\..\src\core\lib\support\string.h">
       <Filter>src\core\lib\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\support\string_win32.h">
+    <ClInclude Include="$(SolutionDir)\..\src\core\lib\support\string_windows.h">
       <Filter>src\core\lib\support</Filter>
     </ClInclude>
     <ClInclude Include="$(SolutionDir)\..\src\core\lib\support\thd_internal.h">
@@ -340,4 +340,3 @@
     </Filter>
   </ItemGroup>
 </Project>
-
diff --git a/vsprojects/vcxproj/grpc++/grpc++.vcxproj b/vsprojects/vcxproj/grpc++/grpc++.vcxproj
index 65de5e9..64c7b14 100644
--- a/vsprojects/vcxproj/grpc++/grpc++.vcxproj
+++ b/vsprojects/vcxproj/grpc++/grpc++.vcxproj
@@ -343,7 +343,7 @@
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_gcc_atomic.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_gcc_sync.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_win32.h" />
+    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_windows.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\log.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\port_platform.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\slice.h" />
@@ -351,7 +351,7 @@
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_generic.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_posix.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_win32.h" />
+    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_windows.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\time.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\config.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\config_protobuf.h" />
diff --git a/vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters b/vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters
index ce50bd9..5451f5b 100644
--- a/vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters
@@ -351,7 +351,7 @@
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_gcc_sync.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_win32.h">
+    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_windows.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\log.h">
@@ -375,7 +375,7 @@
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_posix.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_win32.h">
+    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_windows.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\time.h">
diff --git a/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj b/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj
index 895e223..b3c2c56 100644
--- a/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj
+++ b/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj
@@ -343,7 +343,7 @@
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_gcc_atomic.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_gcc_sync.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_win32.h" />
+    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_windows.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\log.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\port_platform.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\slice.h" />
@@ -351,7 +351,7 @@
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_generic.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_posix.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_win32.h" />
+    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_windows.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\time.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\config.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\config_protobuf.h" />
diff --git a/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj.filters b/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj.filters
index ab305fa..8851cbf 100644
--- a/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj.filters
@@ -336,7 +336,7 @@
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_gcc_sync.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_win32.h">
+    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_windows.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\log.h">
@@ -360,7 +360,7 @@
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_posix.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_win32.h">
+    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_windows.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\time.h">
diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj b/vsprojects/vcxproj/grpc/grpc.vcxproj
index e5379dc..e8d1695 100644
--- a/vsprojects/vcxproj/grpc/grpc.vcxproj
+++ b/vsprojects/vcxproj/grpc/grpc.vcxproj
@@ -283,7 +283,7 @@
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_gcc_atomic.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_gcc_sync.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_win32.h" />
+    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_windows.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\log.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\port_platform.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\slice.h" />
@@ -291,7 +291,7 @@
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_generic.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_posix.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_win32.h" />
+    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_windows.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\time.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\grpc_cronet.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\grpc_security.h" />
@@ -332,7 +332,7 @@
     <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\sockaddr.h" />
     <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\sockaddr_posix.h" />
     <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\sockaddr_utils.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\sockaddr_win32.h" />
+    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\sockaddr_windows.h" />
     <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\socket_utils_posix.h" />
     <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\socket_windows.h" />
     <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\tcp_client.h" />
@@ -671,7 +671,7 @@
     </ClCompile>
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\credentials\google_default\credentials_posix.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\credentials\google_default\credentials_win32.c">
+    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\credentials\google_default\credentials_windows.c">
     </ClCompile>
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\credentials\google_default\google_default_credentials.c">
     </ClCompile>
@@ -826,4 +826,3 @@
     <Error Condition="!Exists('$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.openssl.1.0.204.1\build\native\grpc.dependencies.openssl.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.openssl.1.0.204.1\build\native\grpc.dependencies.openssl.targets')" />
   </Target>
 </Project>
-
diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters
index 95a5a73..57f8cc2 100644
--- a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters
@@ -337,7 +337,7 @@
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\credentials\google_default\credentials_posix.c">
       <Filter>src\core\lib\security\credentials\google_default</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\credentials\google_default\credentials_win32.c">
+    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\credentials\google_default\credentials_windows.c">
       <Filter>src\core\lib\security\credentials\google_default</Filter>
     </ClCompile>
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\credentials\google_default\google_default_credentials.c">
@@ -579,7 +579,7 @@
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_gcc_sync.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_win32.h">
+    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_windows.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\log.h">
@@ -603,7 +603,7 @@
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_posix.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_win32.h">
+    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_windows.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\time.h">
@@ -722,7 +722,7 @@
     <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\sockaddr_utils.h">
       <Filter>src\core\lib\iomgr</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\sockaddr_win32.h">
+    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\sockaddr_windows.h">
       <Filter>src\core\lib\iomgr</Filter>
     </ClInclude>
     <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\socket_utils_posix.h">
@@ -1255,4 +1255,3 @@
     </Filter>
   </ItemGroup>
 </Project>
-
diff --git a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj
index 90ad80f..e009756 100644
--- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj
+++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj
@@ -274,7 +274,7 @@
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_gcc_atomic.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_gcc_sync.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_win32.h" />
+    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_windows.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\log.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\port_platform.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\slice.h" />
@@ -282,7 +282,7 @@
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_generic.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_posix.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_win32.h" />
+    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_windows.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\time.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\census.h" />
   </ItemGroup>
@@ -320,7 +320,7 @@
     <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\sockaddr.h" />
     <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\sockaddr_posix.h" />
     <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\sockaddr_utils.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\sockaddr_win32.h" />
+    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\sockaddr_windows.h" />
     <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\socket_utils_posix.h" />
     <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\socket_windows.h" />
     <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\tcp_client.h" />
diff --git a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters
index 2b19c0f..b407178 100644
--- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters
@@ -486,7 +486,7 @@
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_gcc_sync.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_win32.h">
+    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_windows.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\log.h">
@@ -510,7 +510,7 @@
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_posix.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_win32.h">
+    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_windows.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\time.h">
@@ -620,7 +620,7 @@
     <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\sockaddr_utils.h">
       <Filter>src\core\lib\iomgr</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\sockaddr_win32.h">
+    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\sockaddr_windows.h">
       <Filter>src\core\lib\iomgr</Filter>
     </ClInclude>
     <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\socket_utils_posix.h">
diff --git a/vsprojects/vcxproj/test/codegen_test_full/codegen_test_full.vcxproj b/vsprojects/vcxproj/test/codegen_test_full/codegen_test_full.vcxproj
index 34e939c..d1c11fc 100644
--- a/vsprojects/vcxproj/test/codegen_test_full/codegen_test_full.vcxproj
+++ b/vsprojects/vcxproj/test/codegen_test_full/codegen_test_full.vcxproj
@@ -201,7 +201,7 @@
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_gcc_atomic.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_gcc_sync.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_win32.h" />
+    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_windows.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\log.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\port_platform.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\slice.h" />
@@ -209,7 +209,7 @@
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_generic.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_posix.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_win32.h" />
+    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_windows.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\time.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\config.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\config_protobuf.h" />
diff --git a/vsprojects/vcxproj/test/codegen_test_full/codegen_test_full.vcxproj.filters b/vsprojects/vcxproj/test/codegen_test_full/codegen_test_full.vcxproj.filters
index d662365..9c9ecee 100644
--- a/vsprojects/vcxproj/test/codegen_test_full/codegen_test_full.vcxproj.filters
+++ b/vsprojects/vcxproj/test/codegen_test_full/codegen_test_full.vcxproj.filters
@@ -150,7 +150,7 @@
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_gcc_sync.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_win32.h">
+    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_windows.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\log.h">
@@ -174,7 +174,7 @@
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_posix.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_win32.h">
+    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_windows.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\time.h">
diff --git a/vsprojects/vcxproj/test/codegen_test_minimal/codegen_test_minimal.vcxproj b/vsprojects/vcxproj/test/codegen_test_minimal/codegen_test_minimal.vcxproj
index 890d77d..34d3b04 100644
--- a/vsprojects/vcxproj/test/codegen_test_minimal/codegen_test_minimal.vcxproj
+++ b/vsprojects/vcxproj/test/codegen_test_minimal/codegen_test_minimal.vcxproj
@@ -201,7 +201,7 @@
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_gcc_atomic.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_gcc_sync.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_win32.h" />
+    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_windows.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\log.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\port_platform.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\slice.h" />
@@ -209,7 +209,7 @@
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_generic.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_posix.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_win32.h" />
+    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_windows.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\time.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\config.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\config_protobuf.h" />
diff --git a/vsprojects/vcxproj/test/codegen_test_minimal/codegen_test_minimal.vcxproj.filters b/vsprojects/vcxproj/test/codegen_test_minimal/codegen_test_minimal.vcxproj.filters
index 4e0ba65..62dae36 100644
--- a/vsprojects/vcxproj/test/codegen_test_minimal/codegen_test_minimal.vcxproj.filters
+++ b/vsprojects/vcxproj/test/codegen_test_minimal/codegen_test_minimal.vcxproj.filters
@@ -150,7 +150,7 @@
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_gcc_sync.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_win32.h">
+    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_windows.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\log.h">
@@ -174,7 +174,7 @@
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_posix.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_win32.h">
+    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_windows.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
     <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\time.h">