diff --git a/java/sdk_library.go b/java/sdk_library.go
index b215a76..adbb5d2 100644
--- a/java/sdk_library.go
+++ b/java/sdk_library.go
@@ -962,13 +962,12 @@
 	props.Patch_module = module.properties.Patch_module
 	props.Installable = proptools.BoolPtr(false)
 	props.Libs = module.sdkLibraryProperties.Stub_only_libs
-	// The stub-annotations library contains special versions of the annotations
-	// with CLASS retention policy, so that they're kept around for kotlin.
-	props.Libs = append(props.Libs, "stub-annotations")
 	props.Product_variables.Pdk.Enabled = proptools.BoolPtr(false)
 	props.Openjdk9.Srcs = module.properties.Openjdk9.Srcs
 	props.Openjdk9.Javacflags = module.properties.Openjdk9.Javacflags
-	props.Java_version = module.properties.Java_version
+	// We compile the stubs for 1.8 in line with the main android.jar stubs, and potential
+	// interop with older developer tools that don't support 1.9.
+	props.Java_version = proptools.StringPtr("1.8")
 	if module.deviceProperties.Compile_dex != nil {
 		props.Compile_dex = module.deviceProperties.Compile_dex
 	}
@@ -998,7 +997,6 @@
 		Arg_files                        []string
 		Args                             *string
 		Java_version                     *string
-		Annotations_enabled              *bool
 		Merge_annotations_dirs           []string
 		Merge_inclusion_annotations_dirs []string
 		Generate_stubs                   *bool
@@ -1049,7 +1047,6 @@
 	props.Aidl.Local_include_dirs = module.deviceProperties.Aidl.Local_include_dirs
 	props.Java_version = module.properties.Java_version
 
-	props.Annotations_enabled = proptools.BoolPtr(true)
 	props.Merge_annotations_dirs = module.sdkLibraryProperties.Merge_annotations_dirs
 	props.Merge_inclusion_annotations_dirs = module.sdkLibraryProperties.Merge_inclusion_annotations_dirs
 
diff --git a/java/testing.go b/java/testing.go
index 4872af5..d6a2446 100644
--- a/java/testing.go
+++ b/java/testing.go
@@ -176,7 +176,6 @@
 		"kotlin-stdlib-jdk7",
 		"kotlin-stdlib-jdk8",
 		"kotlin-annotations",
-		"stub-annotations",
 	}
 
 	for _, extra := range extraModules {
diff --git a/sdk/java_sdk_test.go b/sdk/java_sdk_test.go
index e223e56..bbd6384 100644
--- a/sdk/java_sdk_test.go
+++ b/sdk/java_sdk_test.go
@@ -61,20 +61,17 @@
 	name: "android_module_lib_stubs_current",
 }
 java_import {
-	name: "core-lambda-stubs",
+	name: "core-lambda-stubs", 
 	sdk_version: "none",
 }
 java_import {
-	name: "ext",
+	name: "ext", 
 	sdk_version: "none",
 }
 java_import {
-	name: "framework",
+	name: "framework", 
 	sdk_version: "none",
 }
-java_library {
-	name: "stub-annotations",
-}
 ` + bp
 
 	return testSdkWithFs(t, bp, fs)