diff --git a/java/testing.go b/java/testing.go
index a99baf8..7a42e4c 100644
--- a/java/testing.go
+++ b/java/testing.go
@@ -486,17 +486,21 @@
 	}
 
 	extraApiLibraryModules := map[string]droidstubsStruct{
-		"android_stubs_current.from-text":                 publicDroidstubs,
-		"android_system_stubs_current.from-text":          systemDroidstubs,
-		"android_test_stubs_current.from-text":            testDroidstubs,
-		"android_module_lib_stubs_current.from-text":      moduleLibDroidstubs,
-		"android_module_lib_stubs_current_full.from-text": moduleLibDroidstubs,
-		"android_system_server_stubs_current.from-text":   systemServerDroidstubs,
-		"core.current.stubs.from-text":                    publicDroidstubs,
-		"legacy.core.platform.api.stubs.from-text":        publicDroidstubs,
-		"stable.core.platform.api.stubs.from-text":        publicDroidstubs,
-		"core-lambda-stubs.from-text":                     publicDroidstubs,
-		"android-non-updatable.stubs.test_module_lib":     moduleLibDroidstubs,
+		"android_stubs_current.from-text":                  publicDroidstubs,
+		"android_system_stubs_current.from-text":           systemDroidstubs,
+		"android_test_stubs_current.from-text":             testDroidstubs,
+		"android_module_lib_stubs_current.from-text":       moduleLibDroidstubs,
+		"android_module_lib_stubs_current_full.from-text":  moduleLibDroidstubs,
+		"android_system_server_stubs_current.from-text":    systemServerDroidstubs,
+		"core.current.stubs.from-text":                     publicDroidstubs,
+		"legacy.core.platform.api.stubs.from-text":         publicDroidstubs,
+		"stable.core.platform.api.stubs.from-text":         publicDroidstubs,
+		"core-lambda-stubs.from-text":                      publicDroidstubs,
+		"android-non-updatable.stubs.from-text":            publicDroidstubs,
+		"android-non-updatable.stubs.system.from-text":     systemDroidstubs,
+		"android-non-updatable.stubs.test.from-text":       testDroidstubs,
+		"android-non-updatable.stubs.module_lib.from-text": moduleLibDroidstubs,
+		"android-non-updatable.stubs.test_module_lib":      moduleLibDroidstubs,
 	}
 
 	for _, droidstubs := range droidstubsStructs {
@@ -525,8 +529,6 @@
 			name: "%s",
 			api_contributions: ["%s"],
 			stubs_type: "everything",
-			sdk_version: "none",
-			system_modules: "none",
 		}
         `, libName, droidstubs.name+".api.contribution")
 	}