Fixing tf.contrib.data API declarations.

PiperOrigin-RevId: 179943582

tensorflow/contrib/data/__init__.py

@@ -24,18 +24,20 @@
 @@TextLineDataset
 
 @@batch_and_drop_remainder
-@@padded_batch_and_drop_remainder
 @@dense_to_sparse_batch
 @@enumerate_dataset
 @@group_by_window
 @@ignore_errors
 @@make_saveable_from_iterator
-@@read_batch_features
-@@unbatch
+@@map_and_batch
+@@padded_batch_and_drop_remainder
 @@parallel_interleave
+@@read_batch_features
 @@rejection_resample
 @@scan
+@@shuffle_and_repeat
 @@sloppy_interleave
+@@unbatch
 
 @@get_single_element
 
@@ -50,6 +52,7 @@
 
 from tensorflow.contrib.data.python.ops.batching import batch_and_drop_remainder
 from tensorflow.contrib.data.python.ops.batching import dense_to_sparse_batch
+from tensorflow.contrib.data.python.ops.batching import map_and_batch
 from tensorflow.contrib.data.python.ops.batching import padded_batch_and_drop_remainder
 from tensorflow.contrib.data.python.ops.batching import unbatch
 from tensorflow.contrib.data.python.ops.counter import Counter