diff --git a/java/java.go b/java/java.go
index 7fdf94eba..497b28510 100644
--- a/java/java.go
+++ b/java/java.go
@@ -271,13 +271,13 @@ func decodeSdkDep(ctx android.BaseContext, v string) sdkDep {
 		}
 	}
 
-	toModule := func(m string) sdkDep {
-		return sdkDep{
-			useModule:     true,
-			module:        m,
-			systemModules: m + "_system_modules",
-		}
-	}
+	//toModule := func(m string) sdkDep {
+	//	return sdkDep{
+	//		useModule:     true,
+	//		module:        m,
+	//		systemModules: m + "_system_modules",
+	//	}
+	//}
 
 	if ctx.AConfig().UnbundledBuild() && v != "" {
 		return toFile(v)
@@ -288,12 +288,14 @@ func decodeSdkDep(ctx android.BaseContext, v string) sdkDep {
 		return sdkDep{
 			useDefaultLibs: true,
 		}
-	case "current":
-		return toModule("android_stubs_current")
-	case "system_current":
-		return toModule("android_system_stubs_current")
-	case "test_current":
-		return toModule("android_test_stubs_current")
+	// TODO(ccross): re-enable these once we generate stubs, until then
+	// use the stubs in prebuilts/sdk/*current
+	//case "current":
+	//	return toModule("android_stubs_current")
+	//case "system_current":
+	//	return toModule("android_system_stubs_current")
+	//case "test_current":
+	//	return toModule("android_test_stubs_current")
 	default:
 		return toFile(v)
 	}
@@ -478,6 +480,9 @@ func (j *Module) collectBuilderFlags(ctx android.ModuleContext, deps deps) javaB
 		flags.javaVersion = "1.7"
 	} else if ctx.Device() && sdk <= 26 || !ctx.AConfig().TargetOpenJDK9() {
 		flags.javaVersion = "1.8"
+	} else if ctx.Device() && j.deviceProperties.Sdk_version != "" && sdk == 10000 {
+		// TODO(ccross): once we generate stubs we should be able to use 1.9 for sdk_version: "current"
+		flags.javaVersion = "1.8"
 	} else {
 		flags.javaVersion = "1.9"
 	}
diff --git a/java/java_test.go b/java/java_test.go
index bf839835d..451f58e9b 100644
--- a/java/java_test.go
+++ b/java/java_test.go
@@ -123,8 +123,14 @@ func testJavaWithEnv(t *testing.T, bp string, env map[string]string) *android.Te
 		"res/b":      nil,
 		"res2/a":     nil,
 
-		"prebuilts/sdk/14/android.jar":    nil,
-		"prebuilts/sdk/14/framework.aidl": nil,
+		"prebuilts/sdk/14/android.jar":                nil,
+		"prebuilts/sdk/14/framework.aidl":             nil,
+		"prebuilts/sdk/current/android.jar":           nil,
+		"prebuilts/sdk/current/framework.aidl":        nil,
+		"prebuilts/sdk/system_current/android.jar":    nil,
+		"prebuilts/sdk/system_current/framework.aidl": nil,
+		"prebuilts/sdk/test_current/android.jar":      nil,
+		"prebuilts/sdk/test_current/framework.aidl":   nil,
 	})
 
 	_, errs := ctx.ParseBlueprintsFiles("Android.bp")
@@ -246,25 +252,25 @@ var classpathTestcases = []struct {
 
 		name:          "current",
 		properties:    `sdk_version: "current",`,
-		bootclasspath: []string{"android_stubs_current"},
-		system:        "android_stubs_current_system_modules",
-		classpath:     []string{},
+		bootclasspath: []string{`""`},
+		system:        "bootclasspath", // special value to tell 1.9 test to expect bootclasspath
+		classpath:     []string{"prebuilts/sdk/current/android.jar"},
 	},
 	{
 
 		name:          "system_current",
 		properties:    `sdk_version: "system_current",`,
-		bootclasspath: []string{"android_system_stubs_current"},
-		system:        "android_system_stubs_current_system_modules",
-		classpath:     []string{},
+		bootclasspath: []string{`""`},
+		system:        "bootclasspath", // special value to tell 1.9 test to expect bootclasspath
+		classpath:     []string{"prebuilts/sdk/system_current/android.jar"},
 	},
 	{
 
 		name:          "test_current",
 		properties:    `sdk_version: "test_current",`,
-		bootclasspath: []string{"android_test_stubs_current"},
-		system:        "android_test_stubs_current_system_modules",
-		classpath:     []string{},
+		bootclasspath: []string{`""`},
+		system:        "bootclasspath", // special value to tell 1.9 test to expect bootclasspath
+		classpath:     []string{"prebuilts/sdk/test_current/android.jar"},
 	},
 	{