fix sanity and bazel

src/core/lib/channel/channelz_registry.h

@@ -16,8 +16,8 @@
  *
  */
 
-#ifndef GRPC_CORE_LIB_CHANNEL_CHANNELz_REGISTRY_H
+#ifndef GRPC_CORE_LIB_CHANNEL_CHANNELZ_REGISTRY_H
-#define GRPC_CORE_LIB_CHANNEL_CHANNELz_REGISTRY_H
+#define GRPC_CORE_LIB_CHANNEL_CHANNELZ_REGISTRY_H
 
 #include <grpc/impl/codegen/port_platform.h>
 
@@ -83,4 +83,4 @@ class ChannelzRegistry {
 
 }  // namespace grpc_core
 
-#endif /* GRPC_CORE_LIB_CHANNEL_CHANNELz_REGISTRY_H */
+#endif /* GRPC_CORE_LIB_CHANNEL_CHANNELZ_REGISTRY_H */

test/core/channel/channelz_registry_test.cc

@@ -32,7 +32,6 @@
 #include "src/core/lib/json/json.h"
 
 #include "test/core/util/test_config.h"
-#include "test/cpp/util/channel_trace_proto_helper.h"
 
 #include <stdlib.h>
 #include <string.h>