diff --git a/build-tools/mono-runtimes/mono-runtimes.targets b/build-tools/mono-runtimes/mono-runtimes.targets
index 339a210007b..86d1c63e428 100644
--- a/build-tools/mono-runtimes/mono-runtimes.targets
+++ b/build-tools/mono-runtimes/mono-runtimes.targets
@@ -73,8 +73,9 @@
   </Target>
   <Target Name="_InstallBcl"
       Inputs="$(_MonoPath)\mcs\class\lib\monodroid\mscorlib.dll"
-      Outputs="$(OutputPath)\lib\xbuild-frameworks\MonoAndroid\v1.0\mscorlib.dll">
+      Outputs="$(OutputPath)lib\xbuild-frameworks\MonoAndroid\v1.0\mscorlib.dll;$(OutputPath)lib\xbuild-frameworks\MonoAndroid\v1.0\RedistList\FrameworkList.xml">
     <MakeDir Directories="$(OutputPath)\lib\xbuild-frameworks\MonoAndroid\v1.0" />
+    <MakeDir Directories="$(OutputPath)\lib\xbuild-frameworks\MonoAndroid\v1.0\RedistList" />
     <MakeDir Directories="$(OutputPath)\lib\xbuild-frameworks\MonoAndroid\v1.0\Facades" />
     <ItemGroup>
       <_Assemblies Include="$(_MonoPath)\mcs\class\lib\monodroid\*.dll" />
@@ -91,6 +92,15 @@
     <Touch
         Files="$(OutputPath)\lib\xbuild-frameworks\MonoAndroid\v1.0\mscorlib.dll"
     />
+    <ItemGroup>
+      <FrameworkList Include="&lt;FileList Redist=&quot;MonoAndroid&quot; Name=&quot;Xamarin.Android Base Class Libraries&quot;&gt;" />
+      <FrameworkList Include="&lt;/FileList&gt;" />
+    </ItemGroup>
+    <WriteLinesToFile
+        File="$(OutputPath)lib\xbuild-frameworks\MonoAndroid\v1.0\RedistList\FrameworkList.xml"
+        Lines="@(FrameworkList)"
+        Overwrite="True"
+    />
   </Target>
   <Target Name="_CleanRuntimes"
       AfterTargets="Clean">
diff --git a/src/Mono.Android/Mono.Android.targets b/src/Mono.Android/Mono.Android.targets
index 34afe42e7c9..8b457ec64a9 100644
--- a/src/Mono.Android/Mono.Android.targets
+++ b/src/Mono.Android/Mono.Android.targets
@@ -117,6 +117,21 @@
         Command="jar cf &quot;$(OutputPath)mono.android.jar&quot; -C &quot;$(IntermediateOutputPath)android-$(AndroidApiLevel).jcw\bin&quot; ."
     />
   </Target>
+  <Target Name="_GenerateJavaCallableWrappers"
+      AfterTargets="CoreBuild"
+      Inputs="$(OutputPath)$(AssemblyName).dll"
+      Outputs="$(OutputPath)RedistList\FrameworkList.xml">
+   <MakeDir Directories="$(OutputPath)RedistList" />
+   <ItemGroup>
+     <FrameworkList Include="&lt;FileList Redist=&quot;MonoAndroid&quot; Name=&quot;Xamarin.Android $(AndroidFrameworkVersion) Support&quot; IncludeFramework=&quot;v1.0&quot;&gt;" />
+     <FrameworkList Include="&lt;/FileList&gt;" />
+   </ItemGroup>
+   <WriteLinesToFile
+       File="$(OutputPath)RedistList\FrameworkList.xml"
+       Lines="@(FrameworkList)"
+       Overwrite="True"
+   />
+  </Target>
   <Target Name="_CleanBinding"
       AfterTargets="Clean">
     <RemoveDir Directories="$(IntermediateOutputPath)android-$(AndroidApiLevel);$(IntermediateOutputPath)android-$(AndroidApiLevel).jcw" />
diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
index 1652f21a257..2e75b389d9e 100755
--- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
+++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
@@ -800,13 +800,6 @@ because xbuild doesn't support framework reference assemblies.
 	<CreateProperty Value="$(DefineConstants);$(AndroidDefineConstants)">
 		<Output TaskParameter="Value" PropertyName="DefineConstants" />
 	</CreateProperty>
-
-	<CreateProperty Value="smcs" Condition="'$(OS)' == 'Unix'">
-		<Output TaskParameter="Value" PropertyName="CscToolExe"/>
-	</CreateProperty>
-	<CreateProperty Value="$(_MonoAndroidBinDirectory)" Condition="'$(OS)' == 'Unix'">
-		<Output TaskParameter="Value" PropertyName="CscToolPath"/>
-	</CreateProperty>
 </Target>
 
 <!-- uploadflags.txt