Fix Xamarin.Android SDK locations to match the latest paths.

Now we have:

	bin/
	include/
	lib/xamarin.android/lib/xbuild
	lib/xamarin.android/lib/xbuild/Xamarin/Android (`mandroid` in the past)
	lib/xamarin.android/lib/xbuild-frameworks/MonoAndroid/v*
	Version*

Author: atsushieno

binder/Utils/XamarinAndroid.cs

@@ -73,10 +73,10 @@ static string GetMonoDroidLibPath()
 
         static readonly Lazy<string[]> targetFrameworks = new Lazy<string[]>(() => new[]
         {
-            Combine(Path, "lib", "xbuild-frameworks", "MonoAndroid", "v1.0"),
-            Combine(Path, "lib", "xbuild-frameworks", "MonoAndroid", "v1.0", "Facades"),
-            Combine(Path, "lib", "xbuild-frameworks", "MonoAndroid", TargetFrameworkVersion),
-            Combine(Path, "lib", "xbuild-frameworks", "MonoAndroid", "v2.3"), //Mono.Android.Export.dll is here
+            Combine(Path, "lib", "xamarin.android", "xbuild-frameworks", "MonoAndroid", "v1.0"),
+            Combine(Path, "lib", "xamarin.android", "xbuild-frameworks", "MonoAndroid", "v1.0", "Facades"),
+            Combine(Path, "lib", "xamarin.android", "xbuild-frameworks", "MonoAndroid", TargetFrameworkVersion),
+            Combine(Path, "lib", "xamarin.android", "xbuild-frameworks", "MonoAndroid", "v2.3"), //Mono.Android.Export.dll is here
         });
 
         public static string[] TargetFrameworkDirectories => targetFrameworks.Value;

binder/Utils/XamarinAndroidBuild.cs

@@ -25,7 +25,7 @@ static class XamarinAndroidBuild
         static ProjectRootElement CreateProject()
         {
             var monoDroidPath = XamarinAndroid.Path;
-            var msBuildPath = Path.Combine(monoDroidPath, "lib", "xbuild", "Xamarin", "Android");
+            var msBuildPath = Path.Combine(monoDroidPath, "lib", "xamarin.android", "xbuild", "Xamarin", "Android");
             if (!msBuildPath.EndsWith(Path.DirectorySeparatorChar.ToString(), StringComparison.OrdinalIgnoreCase))
                 msBuildPath = msBuildPath + Path.DirectorySeparatorChar;
 

external/MonoDroidSdk/MonoDroidSdkBase.cs

@@ -55,7 +55,7 @@ public void Initialize (string expectedRuntimePath = null, string binPath = null
 
 			RuntimePath = runtimePath;
 			#pragma warning disable 0618
-			SdkPath     = Path.GetFullPath (Path.Combine (runtimePath, "..", ".."));
+			SdkPath     = Path.GetFullPath (Path.Combine (runtimePath, "..", "..", ".."));
 			#pragma warning restore 0618
 			BinPath     = binPath;
 			BclPath     = bclPath;
@@ -106,14 +106,13 @@ public void Reset ()
 		protected static bool ValidateRuntime (string loc)
 		{
 			return !string.IsNullOrWhiteSpace (loc) &&
-				(File.Exists (Path.Combine (loc, DebugRuntime)) ||    // Normal/expected
-				 File.Exists (Path.Combine (loc, ClassParseExe)) ||    // Normal/expected
+				(File.Exists (Path.Combine (loc, ClassParseExe)) ||    // Normal/expected
 				 File.Exists (Path.Combine (loc, "Xamarin.Android.Common.targets"))); //VS on Windows
 		}
 
 		protected static bool ValidateFramework (string loc)
 		{
-			return loc != null && File.Exists (Path.Combine (loc, "mscorlib.dll"));
+			return loc != null && File.Exists (Path.Combine (loc, "v1.0", "mscorlib.dll"));
 		}
 
 		public string FindVersionFile ()

external/MonoDroidSdk/MonoDroidSdkUnix.cs

@@ -8,9 +8,9 @@ namespace Xamarin.Android.Tools
 	class MonoDroidSdkUnix : MonoDroidSdkBase
 	{
 		readonly static string[] RuntimeToFrameworkPaths = new[]{
-			Path.Combine ("..", "..", "..", ".xamarin.android", "lib", "xbuild-frameworks", "MonoAndroid"),
-			Path.Combine ("..", "xbuild-frameworks", "MonoAndroid"),
-			Path.Combine ("..", "mono", "2.1"),
+			Path.Combine ("..", "..", "..", "..", ".xamarin.android", "lib", "xamarin.android", "xbuild-frameworks", "MonoAndroid"),
+			Path.Combine ("..", "..", "..", "xbuild-frameworks", "MonoAndroid"),
+			Path.Combine ("..", "..", "mono", "2.1"),
 		};
 
 		readonly static string[] SearchPaths = {
@@ -24,7 +24,7 @@ protected override string FindRuntime ()
 		{
 			string monoAndroidPath = Environment.GetEnvironmentVariable ("MONO_ANDROID_PATH");
 			if (!string.IsNullOrEmpty (monoAndroidPath)) {
-				string libMandroid = Path.Combine (monoAndroidPath, "lib", "mandroid");
+				string libMandroid = Path.Combine (monoAndroidPath, "lib", "xamarin.android", "xbuild", "Xamarin", "Android");
 				if (Directory.Exists (libMandroid)) {
 					if (ValidateRuntime (libMandroid))
 						return libMandroid;
@@ -72,23 +72,23 @@ protected override string FindFramework (string runtimePath)
 
 		protected override string FindBin (string runtimePath)
 		{
-			string binPath = Path.GetFullPath (Path.Combine (runtimePath, "..", "..", "bin"));
+			string binPath = Path.GetFullPath (Path.Combine (runtimePath, "..", "..", "..", "..", "..", "bin"));
 			if (File.Exists (Path.Combine (binPath, GeneratorScript)))
 				return binPath;
 			return null;
 		}
 
 		protected override string FindInclude (string runtimePath)
 		{
-			string includeDir = Path.GetFullPath (Path.Combine (runtimePath, "..", "..", "include"));
+				string includeDir = Path.GetFullPath (Path.Combine (runtimePath, "..", "..", "..", "..", "..", "include"));
 			if (Directory.Exists (includeDir))
 				return includeDir;
 			return null;
 		}
 
 		protected override string FindLibraries (string runtimePath)
 		{
-			return Path.GetFullPath (Path.Combine (runtimePath, ".."));
+			return Path.GetFullPath (Path.Combine (runtimePath, "..", "..", "..", ".."));
 		}
 
 		protected override IEnumerable<string> GetVersionFileLocations ()