This allows us to get rid of the compatibility hacks that we had to add (tf-1.15-bazel-1.0.patch) and also fixes #77626. (cherry picked from commit c7adb4ee)