Merge changes I0d679648,I31542e7f am: 31d57588c9 am: 6414dde54e

am: 176de85374

Change-Id: I06ce4efde1122b79b757cef2985ac4ecabad80a6

java/config/config.go

@@ -88,12 +88,10 @@ func init() {
 		return ctx.Config().Getenv("ANDROID_JAVA_HOME")
 	})
 	pctx.VariableFunc("JlinkVersion", func(ctx android.PackageVarContext) string {
-		switch ctx.Config().Getenv("EXPERIMENTAL_USE_OPENJDK11_TOOLCHAIN") {
-		case "false":
-			return "9"
-		default:
-			return "11"
+		if override := ctx.Config().Getenv("OVERRIDE_JLINK_VERSION_NUMBER"); override != "" {
+			return override
 		}
+		return "11"
 	})
 
 	pctx.SourcePathVariable("JavaToolchain", "${JavaHome}/bin")