fixing the conflict for building

tensorflow/python/BUILD

@@ -463,35 +463,6 @@ alias(
     actual = "//tensorflow/python/util:_pywrap_utils",
 )
 
-tf_python_pybind_extension(
-    name = "_pywrap_utils",
-    srcs = ["util/util_wrapper.cc"],
-    hdrs = ["util/util.h"],
-    module_name = "_pywrap_utils",
-    deps = [
-        ":pybind11_lib",
-        "//third_party/python_runtime:headers",
-        "@pybind11",
-        "//tensorflow/core/platform:platform_port",
-
-    ],
-)
-
-tf_python_pybind_extension(
-    name = "_pywrap_kernel_registry",
-    srcs = ["util/kernel_registry_wrapper.cc"],
-    hdrs = ["util/kernel_registry.h"],
-    module_name = "_pywrap_kernel_registry",
-    deps = [
-        ":pybind11_lib",
-        "//tensorflow/core:framework_headers_lib",
-        "//tensorflow/core:lib_headers_for_pybind",
-        "//tensorflow/core:protos_all_cc",
-        "//third_party/python_runtime:headers",
-        "@pybind11",
-    ],
-)
-
 tf_python_pybind_extension(
     name = "_pywrap_quantize_training",
     srcs = [
@@ -1620,7 +1591,6 @@ py_library(
     deps = [
         ":platform",
         "//tensorflow/python/util",
-        # TODO(mdan): Remove this once the transitive dependency is fixed.
         "//tensorflow/python/util:tf_stack",
     ],
 )
@@ -2048,7 +2018,6 @@ cuda_py_test(
     python_version = "PY3",
     shard_count = 10,
     tags = [
-        "no_rocm",
         "noasan",
         "optonly",
     ],
@@ -2094,7 +2063,6 @@ tf_py_test(
     srcs = ["framework/importer_test.py"],
     main = "framework/importer_test.py",
     python_version = "PY3",
-    tags = ["no_rocm"],
     deps = [
         ":array_ops",
         ":client_testlib",
@@ -4915,7 +4883,6 @@ cuda_py_test(
     srcs = ["ops/nn_fused_batchnorm_test.py"],
     python_version = "PY3",
     shard_count = 24,
-    tags = ["no_rocm"],
     deps = [
         ":array_ops",
         ":client_testlib",

tensorflow/python/util/BUILD

@@ -76,6 +76,7 @@ tf_python_pybind_extension(
         "//tensorflow/python:pybind11_lib",
         "//third_party/python_runtime:headers",
         "@pybind11",
+        "//tensorflow/core/platform:platform_port",
     ],
 )