Correct some more tf.contrib violations.
Correct some more tf.contrib violations.

PiperOrigin-RevId: 289721730

tensorflow/tensor2tensor,tensorflow/tensor2tensor,tensorflow/tensor2tensor,tensorflow/tensor2tensor,tensorflow/tensor2tensor