diff --git a/build-tools/create-packs/Microsoft.Android.Sdk.proj b/build-tools/create-packs/Microsoft.Android.Sdk.proj
index efd7e7d2ed4..6639f964d92 100644
--- a/build-tools/create-packs/Microsoft.Android.Sdk.proj
+++ b/build-tools/create-packs/Microsoft.Android.Sdk.proj
@@ -111,7 +111,6 @@ WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
         RuntimePackNamePatterns="Microsoft.Android.Runtime.**RID**"
         RuntimePackRuntimeIdentifiers="@(_AndroidNETAppRuntimePackRids, '%3B')"
         Profile="Android"
-        IsTrimmable="true"
     />
   </ItemGroup>
 </Project>
diff --git a/external/Java.Interop b/external/Java.Interop
index f9faaaba0ca..df4c5e7c3b7 160000
--- a/external/Java.Interop
+++ b/external/Java.Interop
@@ -1 +1 @@
-Subproject commit f9faaaba0ca2f3721ea1de33fd793edeae059474
+Subproject commit df4c5e7c3b703bbf8a1f332b34d12ae6c2c99a8c
diff --git a/src/Mono.Android.Export/Properties/AssemblyInfo.cs b/src/Mono.Android.Export/Properties/AssemblyInfo.cs
index b3b4c62b5ed..25e6a311bd8 100644
--- a/src/Mono.Android.Export/Properties/AssemblyInfo.cs
+++ b/src/Mono.Android.Export/Properties/AssemblyInfo.cs
@@ -8,6 +8,7 @@
 [assembly: AssemblyCopyright ("Xamarin Inc.")]
 [assembly: AssemblyTrademark ("Xamarin")]
 [assembly: AssemblyCulture ("")]
+[assembly: AssemblyMetadata ("IsTrimmable", "True")]
 
 // The following attributes are used to specify the signing key for the assembly, 
 // if desired. See the Mono documentation for more information about signing.
diff --git a/src/Mono.Android/Properties/AssemblyInfo.cs.in b/src/Mono.Android/Properties/AssemblyInfo.cs.in
index 6c9971f494b..e08322a871b 100644
--- a/src/Mono.Android/Properties/AssemblyInfo.cs.in
+++ b/src/Mono.Android/Properties/AssemblyInfo.cs.in
@@ -16,6 +16,7 @@ using System.Runtime.CompilerServices;
 // FIXME: Probably need to add Copyright 2009-2011 Novell Inc.
 // [assembly: AssemblyCopyright ("Copyright 2011-2014 Xamarin Inc.")]
 [assembly: AssemblyCompany ("Microsoft Corporation")]
+[assembly: AssemblyMetadata ("IsTrimmable", "True")]
 
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Drawing.Color))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Drawing.ColorConverter))]