Update keras code/tests to import modules within keras code base.

PiperOrigin-RevId: 335777060
Change-Id: I2d27e909ffac9418b98340b4bd5ec2937a9b422a

tensorflow/python/keras/layers/BUILD

@@ -439,8 +439,8 @@ py_library(
     srcs_version = "PY2AND3",
     deps = [
         ":recurrent",
-        "//tensorflow/python:rnn_cell",
         "//tensorflow/python:util",
+        "//tensorflow/python/keras/layers/legacy_rnn:rnn_cell_wrapper_impl",
     ],
 )
 
@@ -930,6 +930,7 @@ tf_py_test(
         "//tensorflow/python:client_testlib",
         "//tensorflow/python/keras",
         "//tensorflow/python/keras:combinations",
+        "//tensorflow/python/keras/layers/legacy_rnn:rnn_cell_impl",
         "//tensorflow/python/keras/legacy_tf_layers:layers_base",
         "//third_party/py/numpy",
         "@absl_py//absl/testing:parameterized",

tensorflow/python/keras/layers/legacy_rnn/BUILD

@@ -2,7 +2,10 @@
 #   Contains the legacy TF RNN APIs (internal TensorFlow version).
 
 package(
-    default_visibility = ["//tensorflow:__subpackages__"],
+    default_visibility = [
+        "//tensorflow:__subpackages__",
+        "//tensorflow/python/keras:__subpackages__",
+    ],
     licenses = ["notice"],  # Apache 2.0
 )
 

tensorflow/python/keras/layers/rnn_cell_wrapper_v2.py

@@ -26,8 +26,8 @@ from __future__ import print_function
 
 
 from tensorflow.python.keras.layers import recurrent
+from tensorflow.python.keras.layers.legacy_rnn import rnn_cell_wrapper_impl
 from tensorflow.python.keras.utils import tf_inspect
-from tensorflow.python.ops import rnn_cell_wrapper_impl
 from tensorflow.python.util.tf_export import tf_export
 
 

tensorflow/python/keras/layers/rnn_cell_wrapper_v2_test.py

@@ -26,11 +26,11 @@ from tensorflow.python.framework import ops
 from tensorflow.python.keras import combinations
 from tensorflow.python.keras import layers
 from tensorflow.python.keras.layers import rnn_cell_wrapper_v2
+from tensorflow.python.keras.layers.legacy_rnn import rnn_cell_impl
 from tensorflow.python.keras.legacy_tf_layers import base as legacy_base_layer
 from tensorflow.python.keras.utils import generic_utils
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import init_ops
-from tensorflow.python.ops import rnn_cell_impl
 from tensorflow.python.ops import variables as variables_lib
 from tensorflow.python.platform import test