Merge "Removing 1.9 as fixed target for libcore libraries"
diff --git a/JavaLibrary.bp b/JavaLibrary.bp
index 2ce3d08..e5aa957 100644
--- a/JavaLibrary.bp
+++ b/JavaLibrary.bp
@@ -200,7 +200,6 @@
     },
 
     java_resources: core_resources,
-    java_version: "1.9",
 
     installable: false,
 
@@ -317,7 +316,6 @@
     hostdex: true,
 
     srcs: [":core_libart_java_files"],
-    java_version: "1.9",
 
     sdk_version: "none",
     system_modules: "core-all-system-modules",
@@ -852,7 +850,6 @@
         ":core_oj_api_files",
         ":core_libart_api_files",
     ],
-    java_version: "1.9",
     installable: false,
     sdk_version: "none",
     system_modules: "none",
@@ -946,7 +943,6 @@
         "i18n.module.intra.core.api.stubs",
     ],
     stub_only_static_libs: ["notices-for-stubs-jar"],
-    java_version: "1.9",
 
     // Make dex jars for the stubs available for use by hiddenapi processing.
     compile_dex: true,
@@ -1120,6 +1116,5 @@
     srcs: [
         ":api_surface_annotation_files",
     ],
-    java_version: "1.9",
     sdk_version: "core_current",
 }