Fix unit test failures

Unit tests "manually" read the `JdkInfo*.props` files, and since
the file names and property names changed, things broke.  Oops.

Author: jonpryor

tests/TestJVM/TestJVM.cs

@@ -93,7 +93,7 @@ static string GetOutputDirectoryName ()
 			if (buildName.Contains ('-')) {
 				buildName   = buildName.Substring (0, buildName.IndexOf ('-'));
 			}
-			var jdkPropFile = Path.Combine (binDir, buildName, "JdkInfo.props");
+			var jdkPropFile = Path.Combine (binDir, buildName, "JdkInfo-11.props");
 			if (!File.Exists (jdkPropFile)) {
 				return null;
 			}
@@ -105,7 +105,7 @@ static string GetOutputDirectoryName ()
 				.Elements (msbuild + "Choose")
 				.Elements (msbuild + "When")
 				.Elements (msbuild + "PropertyGroup")
-				.Elements (msbuild + "JdkJvmPath")
+				.Elements (msbuild + "JdkJvm11Path")
 				.FirstOrDefault ();
 			if (jdkJvmPath == null) {
 				return null;

tests/Xamarin.Android.Tools.Bytecode-Tests/ConfiguredJdkInfo.cs

@@ -33,7 +33,7 @@ static string ReadJavaSdkDirectoryFromJdkInfoProps ()
 			if (buildName.IndexOf ("-", StringComparison.Ordinal) >= 0) {
 				buildName   = buildName.Substring (0, buildName.IndexOf ('-'));
 			}
-			var jdkPropFile = Path.Combine (binDir, buildName, "JdkInfo.props");
+			var jdkPropFile = Path.Combine (binDir, buildName, "JdkInfo-8.props");
 			if (!File.Exists (jdkPropFile)) {
 				return null;
 			}
@@ -43,7 +43,7 @@ static string ReadJavaSdkDirectoryFromJdkInfoProps ()
 			var jdkProps    = XDocument.Load (jdkPropFile);
 			var jdkPath     = jdkProps.Elements ()
 				.Elements (msbuild + "PropertyGroup")
-				.Elements (msbuild + "JavaSdkDirectory")
+				.Elements (msbuild + "Java8SdkDirectory")
 				.FirstOrDefault ();
 			if (jdkPath == null) {
 				return null;