Merge "Fix sdk_version: "system_current" when Platform_sdk_final=true" am: b007b2bde5 am: 8c3f398c6c

am: 209edee425

Change-Id: I54ea846c9ac2b29354109755225db71dcdaa1527

java/testing.go

@@ -28,7 +28,6 @@ func TestConfig(buildDir string, env map[string]string) android.Config {
 		env["ANDROID_JAVA8_HOME"] = "jdk8"
 	}
 	config := android.TestArchConfig(buildDir, env)
-	config.TestProductVariables.DeviceSystemSdkVersions = []string{"14", "15"}
 
 	return config
 }