Revert changes to PreferredJdkPathsOnly use well-known paths when others fail

Author: kdubau

src/Xamarin.Android.Tools.AndroidSdk/Sdks/AndroidSdkWindows.cs

@@ -41,7 +41,6 @@ public override string PreferedAndroidSdkPath {
 				return null;
 			}
 		}
-
 		public override string PreferedAndroidNdkPath {
 			get {
 				var wow = RegistryEx.Wow64.Key32;
@@ -51,10 +50,13 @@ public override string PreferedAndroidNdkPath {
 				return null;
 			}
 		}
-
 		public override string PreferedJavaSdkPath {
 			get {
-				return GetKnownOpenJdkPaths ().FirstOrDefault ();
+				var wow = RegistryEx.Wow64.Key32;
+				var regKey = GetMDRegistryKey ();
+				if (CheckRegistryKeyForExecutable (RegistryEx.CurrentUser, regKey, MDREG_JAVA_SDK, wow, "bin", JarSigner))
+					return RegistryEx.GetValueString (RegistryEx.CurrentUser, regKey, MDREG_JAVA_SDK, wow);
+				return null;
 			}
 		}
 
@@ -130,9 +132,9 @@ IEnumerable<JdkInfo> ToJdkInfos (IEnumerable<string> paths, string locator)
 					.OrderByDescending (jdk => jdk, JdkInfoVersionComparer.Default);
 			}
 
-			return ToJdkInfos (GetKnownOpenJdkPaths (), "Well-known OpenJDK paths")
-				.Concat (ToJdkInfos(GetPreferredJdkPaths (), "Preferred Registry"))
+			return ToJdkInfos (GetPreferredJdkPaths (), "Preferred Registry")
 				.Concat (ToJdkInfos (GetOpenJdkPaths (), "OpenJDK"))
+				.Concat (ToJdkInfos (GetKnownOpenJdkPaths (), "Well-known OpenJDK paths"))
 				.Concat (ToJdkInfos (GetOracleJdkPaths (), "Oracle JDK"));
 		}
 
@@ -189,8 +191,8 @@ private static IEnumerable<string> GetKnownOpenJdkPaths ()
 			}
 
 			return paths.OrderByDescending (v => v.Item2)
-						 .Where (openJdk => ProcessUtils.FindExecutablesInDirectory (Path.Combine(openJdk.Item1, "bin"), _JarSigner).Any())
-						 .Select (openJdk => openJdk.Item1);
+				.Where (openJdk => ProcessUtils.FindExecutablesInDirectory (Path.Combine(openJdk.Item1, "bin"), _JarSigner).Any())
+				.Select (openJdk => openJdk.Item1);
 		}
 
 		private static IEnumerable<string> GetOracleJdkPaths ()