Merge "Pin the Java version to 11" into main
diff --git a/build/bazel/remote/execution/v2/Android.bp b/build/bazel/remote/execution/v2/Android.bp
index 5d6f900..a9893a2 100644
--- a/build/bazel/remote/execution/v2/Android.bp
+++ b/build/bazel/remote/execution/v2/Android.bp
@@ -38,6 +38,8 @@
         ],
         type: "full",
     },
+    // TODO(b/339514031): Unpin tradefed dependencies to Java 11.
+    java_version: "11",
 }
 
 java_library_host {
@@ -60,4 +62,6 @@
         "libprotobuf-java-full",
         "remote-execution-java-proto",
     ],
+    // TODO(b/339514031): Unpin tradefed dependencies to Java 11.
+    java_version: "11",
 }
diff --git a/build/bazel/semver/Android.bp b/build/bazel/semver/Android.bp
index 2302503..46b9246 100644
--- a/build/bazel/semver/Android.bp
+++ b/build/bazel/semver/Android.bp
@@ -31,4 +31,6 @@
         ],
         type: "full",
     },
+    // TODO(b/339514031): Unpin tradefed dependencies to Java 11.
+    java_version: "11",
 }