diff --git a/build-tools/bundle/bundle.mdproj b/build-tools/bundle/bundle.mdproj
index 8e9541bcd98..eea19bb4499 100644
--- a/build-tools/bundle/bundle.mdproj
+++ b/build-tools/bundle/bundle.mdproj
@@ -7,7 +7,7 @@
     <ProjectGuid>{1640725C-4DB8-4D8D-BC96-74E688A06EEF}</ProjectGuid>
   </PropertyGroup>
   <Import Project="..\..\Configuration.props" />
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">1
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>..\..\bin\Debug</OutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
diff --git a/build-tools/bundle/bundle.targets b/build-tools/bundle/bundle.targets
index 5c2c6a3c93d..3401b494e74 100644
--- a/build-tools/bundle/bundle.targets
+++ b/build-tools/bundle/bundle.targets
@@ -33,7 +33,7 @@
   <Target Name="GetBundlePath"
       DependsOnTargets="_GetHashes">
     <PropertyGroup>
-      <_BundlePath>$(OutputPath)bundle-$(Configuration)-libzip=$(_LibZipHash),llvm=$(_LlvmHash),mono=$(_MonoHash).zip</_BundlePath>
+      <_BundlePath>$(OutputPath)bundle-v1-$(Configuration)-$(HostOS)-libzip=$(_LibZipHash),llvm=$(_LlvmHash),mono=$(_MonoHash).zip</_BundlePath>
     </PropertyGroup>
   </Target>
   <Target Name="Clean"
@@ -52,6 +52,7 @@
       <_Archive Include="@(_InstallUnstrippedProfilerOutput)" />
       <_Archive Include="@(_InstallMonoPosixHelperOutput)" />
       <_Archive Include="@(_InstallUnstrippedMonoPosixHelperOutput)" />
+      <_Archive Include="@(_RuntimeEglibHeaderOutput)" />
       <_Archive Include="@(_LibZipTarget->'$(OutputPath)lib\xbuild\Xamarin\Android\%(OutputLibrary)')" />
       <_Archive Include="$(OutputPath)%(_MonoCrossRuntime.InstallPath)%(_MonoCrossRuntime.CrossMonoName)%(_MonoCrossRuntime.ExeSuffix)"
           Condition=" '@(_MonoCrossRuntime)' != '' "
diff --git a/build-tools/mono-runtimes/mono-runtimes.targets b/build-tools/mono-runtimes/mono-runtimes.targets
index d1c82b5e981..3af296c70d9 100644
--- a/build-tools/mono-runtimes/mono-runtimes.targets
+++ b/build-tools/mono-runtimes/mono-runtimes.targets
@@ -198,6 +198,14 @@
           Condition=" '%(_MonoRuntime.DoBuild)' == 'True' And '%(_MonoRuntime.OutputMonoPosixHelperFilename)' != '' "
           Include="@(_MonoRuntime->'$(OutputPath)\lib\xbuild\Xamarin\Android\lib\%(Identity)\%(OutputMonoPosixHelperFilename).d.%(NativeLibraryExtension)')"
       />
+      <_RuntimeEglibHeaderSource
+          Condition=" '%(_MonoRuntime.DoBuild)' == 'True' "
+          Include="@(_MonoRuntime->'$(IntermediateOutputPath)%(Identity)\eglib\config.h');@(_MonoRuntime->'$(IntermediateOutputPath)%(Identity)\eglib\src\eglib-config.h')"
+      />
+      <_RuntimeEglibHeaderOutput
+          Condition=" '%(_MonoRuntime.DoBuild)' == 'True' "
+          Include="@(_MonoRuntime->'$(OutputPath)include\%(Identity)\eglib\config.h');@(_MonoRuntime->'$(OutputPath)include\%(Identity)\eglib\eglib-config.h')"
+      />
       <_RuntimeBuildStamp       Condition=" '%(_MonoRuntime.DoBuild)' == 'true' " Include="@(_MonoRuntime->'$(IntermediateOutputPath)%(Identity)\.stamp')" />
     </ItemGroup>
   </Target>
@@ -222,6 +230,14 @@
         Condition=" '%(_MonoRuntime.DoBuild)' == 'true' "
         Directories="$(OutputPath)\lib\xbuild\Xamarin\Android\lib\%(_MonoRuntime.Identity)"
     />
+    <MakeDir
+        Condition=" '%(_MonoRuntime.DoBuild)' == 'true' "
+        Directories="$(OutputPath)\include\%(_MonoRuntime.Identity)\eglib"
+    />
+    <Copy
+        SourceFiles="@(_RuntimeEglibHeaderSource)"
+        DestinationFiles="@(_RuntimeEglibHeaderOutput)"
+    />
     <Copy
         SourceFiles="@(_RuntimeSource)"
         DestinationFiles="@(_InstallRuntimeOutput)"
diff --git a/external/mono b/external/mono
index 2c13a959c0a..226a68909a1 160000
--- a/external/mono
+++ b/external/mono
@@ -1 +1 @@
-Subproject commit 2c13a959c0a7bb3d0d5cbb86e8affbb36cf42db4
+Subproject commit 226a68909a1b8c64088fb69c743ac2c46d52c3aa
diff --git a/src/monodroid/jni/Android.mk b/src/monodroid/jni/Android.mk
index 74eaa6bdf20..70ed529d623 100644
--- a/src/monodroid/jni/Android.mk
+++ b/src/monodroid/jni/Android.mk
@@ -36,9 +36,7 @@ LOCAL_LDFLAGS   += \
 	-Wl,--no-undefined \
 
 LOCAL_C_INCLUDES	:= \
-	$(LOCAL_PATH)/../../../build-tools/mono-runtimes/obj/$(CONFIGURATION)/$(TARGET_ARCH_ABI) \
-	$(LOCAL_PATH)/../../../build-tools/mono-runtimes/obj/$(CONFIGURATION)/$(TARGET_ARCH_ABI)/eglib \
-	$(LOCAL_PATH)/../../../build-tools/mono-runtimes/obj/$(CONFIGURATION)/$(TARGET_ARCH_ABI)/eglib/src \
+	$(LOCAL_PATH)/../../../bin/$(CONFIGURATION)/include/$(TARGET_ARCH_ABI)/eglib \
 	$(LOCAL_PATH)/../../../external/mono/eglib/src \
 	$(LOCAL_PATH)/zip