diff --git a/aswb/sdkcompat/as231/com/android/tools/idea/run/tasks/DeployTasksCompat.java b/aswb/sdkcompat/as231/com/android/tools/idea/run/tasks/DeployTasksCompat.java
index d2fb52defee..8c5bde9785e 100644
--- a/aswb/sdkcompat/as231/com/android/tools/idea/run/tasks/DeployTasksCompat.java
+++ b/aswb/sdkcompat/as231/com/android/tools/idea/run/tasks/DeployTasksCompat.java
@@ -23,6 +23,7 @@
 import com.google.idea.common.experiments.BoolExperiment;
 import com.intellij.openapi.project.Project;
 import java.util.Collection;
+import java.util.List;
 
 /** Compat class for {@link DeployTask} */
 public class DeployTasksCompat {
@@ -35,7 +36,7 @@ public static BlazeLaunchTask createDeployTask(
       Project project, Collection<ApkInfo> packages, DeployOptions deployOptions) {
     return launchContext -> {
       try {
-        var unused =
+        List unused =
             new DeployTask(
                     project,
                     packages,
diff --git a/aswb/sdkcompat/as231/com/google/idea/blaze/android/run/runner/BlazeAndroidDebuggerService.java b/aswb/sdkcompat/as231/com/google/idea/blaze/android/run/runner/BlazeAndroidDebuggerService.java
index 9b5866e84ed..5715392a171 100644
--- a/aswb/sdkcompat/as231/com/google/idea/blaze/android/run/runner/BlazeAndroidDebuggerService.java
+++ b/aswb/sdkcompat/as231/com/google/idea/blaze/android/run/runner/BlazeAndroidDebuggerService.java
@@ -129,7 +129,7 @@ public void configureNativeDebugger(
     }
   }
 
-  private static boolean isNdkPluginLoaded() {
+  static boolean isNdkPluginLoaded() {
     return PluginManagerCore.getLoadedPlugins().stream()
         .anyMatch(
             d -> d.isEnabled() && d.getPluginId().getIdString().equals("com.android.tools.ndk"));
diff --git a/aswb/sdkcompat/asdev/com/android/tools/idea/run/tasks/DeployTasksCompat.java b/aswb/sdkcompat/asdev/com/android/tools/idea/run/tasks/DeployTasksCompat.java
index d475822b285..ce440ca9d52 100644
--- a/aswb/sdkcompat/asdev/com/android/tools/idea/run/tasks/DeployTasksCompat.java
+++ b/aswb/sdkcompat/asdev/com/android/tools/idea/run/tasks/DeployTasksCompat.java
@@ -23,6 +23,7 @@
 import com.google.idea.common.experiments.BoolExperiment;
 import com.intellij.openapi.project.Project;
 import java.util.Collection;
+import java.util.List;
 
 /** Compat class for {@link DeployTask} */
 public class DeployTasksCompat {
@@ -35,7 +36,7 @@ public static BlazeLaunchTask createDeployTask(
       Project project, Collection<ApkInfo> packages, DeployOptions deployOptions) {
     return launchContext -> {
       try {
-        var unused =
+        List unused =
             new DeployTask(
                     project,
                     packages,
diff --git a/aswb/sdkcompat/asdev/com/google/idea/blaze/android/run/runner/BlazeAndroidDebuggerService.java b/aswb/sdkcompat/asdev/com/google/idea/blaze/android/run/runner/BlazeAndroidDebuggerService.java
index 9b5866e84ed..5715392a171 100644
--- a/aswb/sdkcompat/asdev/com/google/idea/blaze/android/run/runner/BlazeAndroidDebuggerService.java
+++ b/aswb/sdkcompat/asdev/com/google/idea/blaze/android/run/runner/BlazeAndroidDebuggerService.java
@@ -129,7 +129,7 @@ public void configureNativeDebugger(
     }
   }
 
-  private static boolean isNdkPluginLoaded() {
+  static boolean isNdkPluginLoaded() {
     return PluginManagerCore.getLoadedPlugins().stream()
         .anyMatch(
             d -> d.isEnabled() && d.getPluginId().getIdString().equals("com.android.tools.ndk"));