Merge remote-tracking branch 'grpc/master' into tasks/rollback-boringssl

BUILD

@@ -3002,52 +3002,52 @@ grpc_cc_library(
 grpc_cc_library(
     name = "grpc_client_channel",
     srcs = [
-        "//src/core:ext/filters/client_channel/backend_metric.cc",
-        "//src/core:ext/filters/client_channel/backup_poller.cc",
-        "//src/core:ext/filters/client_channel/channel_connectivity.cc",
-        "//src/core:ext/filters/client_channel/client_channel.cc",
-        "//src/core:ext/filters/client_channel/client_channel_channelz.cc",
-        "//src/core:ext/filters/client_channel/client_channel_factory.cc",
-        "//src/core:ext/filters/client_channel/client_channel_plugin.cc",
-        "//src/core:ext/filters/client_channel/client_channel_service_config.cc",
-        "//src/core:ext/filters/client_channel/config_selector.cc",
-        "//src/core:ext/filters/client_channel/dynamic_filters.cc",
-        "//src/core:ext/filters/client_channel/global_subchannel_pool.cc",
-        "//src/core:ext/filters/client_channel/http_proxy_mapper.cc",
-        "//src/core:ext/filters/client_channel/local_subchannel_pool.cc",
-        "//src/core:ext/filters/client_channel/retry_filter.cc",
-        "//src/core:ext/filters/client_channel/retry_filter_legacy_call_data.cc",
-        "//src/core:ext/filters/client_channel/retry_service_config.cc",
-        "//src/core:ext/filters/client_channel/retry_throttle.cc",
-        "//src/core:ext/filters/client_channel/service_config_channel_arg_filter.cc",
-        "//src/core:ext/filters/client_channel/subchannel.cc",
-        "//src/core:ext/filters/client_channel/subchannel_pool_interface.cc",
-        "//src/core:ext/filters/client_channel/subchannel_stream_client.cc",
+        "//src/core:client_channel/backend_metric.cc",
+        "//src/core:client_channel/backup_poller.cc",
+        "//src/core:client_channel/channel_connectivity.cc",
+        "//src/core:client_channel/client_channel_channelz.cc",
+        "//src/core:client_channel/client_channel_factory.cc",
+        "//src/core:client_channel/client_channel_filter.cc",
+        "//src/core:client_channel/client_channel_plugin.cc",
+        "//src/core:client_channel/client_channel_service_config.cc",
+        "//src/core:client_channel/config_selector.cc",
+        "//src/core:client_channel/dynamic_filters.cc",
+        "//src/core:client_channel/global_subchannel_pool.cc",
+        "//src/core:client_channel/http_proxy_mapper.cc",
+        "//src/core:client_channel/local_subchannel_pool.cc",
+        "//src/core:client_channel/retry_filter.cc",
+        "//src/core:client_channel/retry_filter_legacy_call_data.cc",
+        "//src/core:client_channel/retry_service_config.cc",
+        "//src/core:client_channel/retry_throttle.cc",
+        "//src/core:client_channel/service_config_channel_arg_filter.cc",
+        "//src/core:client_channel/subchannel.cc",
+        "//src/core:client_channel/subchannel_pool_interface.cc",
+        "//src/core:client_channel/subchannel_stream_client.cc",
         "//src/core:load_balancing/child_policy_handler.cc",
         "//src/core:load_balancing/oob_backend_metric.cc",
     ],
     hdrs = [
-        "//src/core:ext/filters/client_channel/backend_metric.h",
-        "//src/core:ext/filters/client_channel/backup_poller.h",
-        "//src/core:ext/filters/client_channel/client_channel.h",
-        "//src/core:ext/filters/client_channel/client_channel_channelz.h",
-        "//src/core:ext/filters/client_channel/client_channel_factory.h",
-        "//src/core:ext/filters/client_channel/client_channel_internal.h",
-        "//src/core:ext/filters/client_channel/client_channel_service_config.h",
-        "//src/core:ext/filters/client_channel/config_selector.h",
-        "//src/core:ext/filters/client_channel/connector.h",
-        "//src/core:ext/filters/client_channel/dynamic_filters.h",
-        "//src/core:ext/filters/client_channel/global_subchannel_pool.h",
-        "//src/core:ext/filters/client_channel/http_proxy_mapper.h",
-        "//src/core:ext/filters/client_channel/local_subchannel_pool.h",
-        "//src/core:ext/filters/client_channel/retry_filter.h",
-        "//src/core:ext/filters/client_channel/retry_filter_legacy_call_data.h",
-        "//src/core:ext/filters/client_channel/retry_service_config.h",
-        "//src/core:ext/filters/client_channel/retry_throttle.h",
-        "//src/core:ext/filters/client_channel/subchannel.h",
-        "//src/core:ext/filters/client_channel/subchannel_interface_internal.h",
-        "//src/core:ext/filters/client_channel/subchannel_pool_interface.h",
-        "//src/core:ext/filters/client_channel/subchannel_stream_client.h",
+        "//src/core:client_channel/backend_metric.h",
+        "//src/core:client_channel/backup_poller.h",
+        "//src/core:client_channel/client_channel_channelz.h",
+        "//src/core:client_channel/client_channel_factory.h",
+        "//src/core:client_channel/client_channel_filter.h",
+        "//src/core:client_channel/client_channel_internal.h",
+        "//src/core:client_channel/client_channel_service_config.h",
+        "//src/core:client_channel/config_selector.h",
+        "//src/core:client_channel/connector.h",
+        "//src/core:client_channel/dynamic_filters.h",
+        "//src/core:client_channel/global_subchannel_pool.h",
+        "//src/core:client_channel/http_proxy_mapper.h",
+        "//src/core:client_channel/local_subchannel_pool.h",
+        "//src/core:client_channel/retry_filter.h",
+        "//src/core:client_channel/retry_filter_legacy_call_data.h",
+        "//src/core:client_channel/retry_service_config.h",
+        "//src/core:client_channel/retry_throttle.h",
+        "//src/core:client_channel/subchannel.h",
+        "//src/core:client_channel/subchannel_interface_internal.h",
+        "//src/core:client_channel/subchannel_pool_interface.h",
+        "//src/core:client_channel/subchannel_stream_client.h",
         "//src/core:load_balancing/child_policy_handler.h",
         "//src/core:load_balancing/oob_backend_metric.h",
         "//src/core:load_balancing/oob_backend_metric_internal.h",