Pull latest changes for TensorFlow (#3312)
* Revert "Revert "Pull latest changes for TensorFlow (#3298)" (#3311)"
This reverts commit ff079bb48744e5aa6696201ccf34057f15fc7cac.
* Disable test TestConv3DNonSquare
* Uncomment test Conv3DNonSquare
* Fix linter issues
* Fix merge conflict
* Fix some more build issues
* Replace xla::int64_t with int64_t for newer changes
* Fix linter issues
* Comment out test TestConv3DNonSquare
