Remove direct references to Kotlin versions

Change-Id: I91782411e4a3cb9ef1e48a6a7017d9d7795e887d
diff --git a/BUILD.bazel b/BUILD.bazel
index e947dbc..7af2d11 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -348,25 +348,7 @@
         "//prebuilts/tools/common/m2/repository/de/undercouch/gradle-download-task/4.0.2:jar",
         "//prebuilts/tools/common/m2/repository/org/antlr/antlr4-runtime/4.5.2-1:jar",
         "//prebuilts/tools/common/m2/repository/org/jetbrains/intellij/deps/trove4j/1.0.20181211:jar",
-        "//prebuilts/tools/common/m2/repository/org/jetbrains/kotlin/kotlin-android-extensions/1.4.21:jar",
-        "//prebuilts/tools/common/m2/repository/org/jetbrains/kotlin/kotlin-annotation-processing-gradle/1.4.21:jar",
-        "//prebuilts/tools/common/m2/repository/org/jetbrains/kotlin/kotlin-build-common/1.4.21:jar",
-        "//prebuilts/tools/common/m2/repository/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.4.21:jar",
-        "//prebuilts/tools/common/m2/repository/org/jetbrains/kotlin/kotlin-compiler-runner/1.4.21:jar",
-        "//prebuilts/tools/common/m2/repository/org/jetbrains/kotlin/kotlin-daemon-client/1.4.21:jar",
-        "//prebuilts/tools/common/m2/repository/org/jetbrains/kotlin/kotlin-daemon-embeddable/1.4.21:jar",
-        "//prebuilts/tools/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1.4.21:jar",
-        "//prebuilts/tools/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-model/1.4.21:jar",
-        "//prebuilts/tools/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin/1.4.21:jar",
-        "//prebuilts/tools/common/m2/repository/org/jetbrains/kotlin/kotlin-script-runtime/1.4.21:jar",
-        "//prebuilts/tools/common/m2/repository/org/jetbrains/kotlin/kotlin-scripting-common/1.4.21:jar",
-        "//prebuilts/tools/common/m2/repository/org/jetbrains/kotlin/kotlin-scripting-compiler-embeddable/1.4.21:jar",
-        "//prebuilts/tools/common/m2/repository/org/jetbrains/kotlin/kotlin-scripting-compiler-impl-embeddable/1.4.21:jar",
-        "//prebuilts/tools/common/m2/repository/org/jetbrains/kotlin/kotlin-scripting-jvm/1.4.21:jar",
-        "//prebuilts/tools/common/m2/repository/org/jetbrains/kotlin/kotlin-util-io/1.4.21:jar",
-        "//prebuilts/tools/common/m2/repository/org/jetbrains/kotlin/kotlin-util-klib/1.4.21:jar",
         "//prebuilts/tools/common/m2/repository/org/jetbrains/kotlinx/kotlinx-coroutines-android/1.4.1:jar",
-        "//prebuilts/tools/common/m2/repository/org/jetbrains/kotlinx/kotlinx-coroutines-core/1.3.7:jar",
         "//prebuilts/tools/common/m2/repository/org/jetbrains/kotlinx/kotlinx-coroutines-core/1.4.1:jar",
     ],
 )
@@ -399,6 +381,7 @@
     output_file_source = "local_repo_zip/dataBindingRuntimeRepo.zip",
     repos = [
         "//tools/base/build-system:gradle_plugin_repo.zip",
+        "//tools/base/third_party/kotlin:kotlin-m2repository.zip",
         ":external_deps.zip",
     ],
     tasks = ["createArchive"],
@@ -431,6 +414,7 @@
     output_file_source = "local_repo_zip/dataBindingRuntimeRepo.zip",
     repos = [
         "//tools/base/build-system:gradle_plugin_repo.zip",
+        "//tools/base/third_party/kotlin:kotlin-m2repository.zip",
         ":external_deps.zip",
     ],
     tasks = ["createArchive"],