diff --git a/Xamarin.Android.sln b/Xamarin.Android.sln
index f93e6403d70..03f06938fb5 100644
--- a/Xamarin.Android.sln
+++ b/Xamarin.Android.sln
@@ -133,8 +133,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Java.Interop.Tools.JavaType
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "relnote-gen", "tools\relnote-gen\relnote-gen.csproj", "{D8E14B43-E929-4C18-9FA6-2C3DC47EFC17}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Java.Runtime.Environment", "external\Java.Interop\src\Java.Runtime.Environment\Java.Runtime.Environment.csproj", "{C0E44558-FEE3-4DD3-986A-3F46DD1BF41B}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "create-android-api", "build-tools\create-android-api\create-android-api.csproj", "{BA4D889D-066B-4C2C-A973-09E319CBC396}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Android.Tools.Aidl-Tests", "tests\Xamarin.Android.Tools.Aidl-Tests\Xamarin.Android.Tools.Aidl-Tests.csproj", "{A39B6D7C-6616-40D6-8AE4-C6CEE93D2708}"
@@ -879,18 +877,6 @@ Global
 		{D8E14B43-E929-4C18-9FA6-2C3DC47EFC17}.Release|x64.Build.0 = Release|Any CPU
 		{D8E14B43-E929-4C18-9FA6-2C3DC47EFC17}.Release|x86.ActiveCfg = Release|Any CPU
 		{D8E14B43-E929-4C18-9FA6-2C3DC47EFC17}.Release|x86.Build.0 = Release|Any CPU
-		{C0E44558-FEE3-4DD3-986A-3F46DD1BF41B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C0E44558-FEE3-4DD3-986A-3F46DD1BF41B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C0E44558-FEE3-4DD3-986A-3F46DD1BF41B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C0E44558-FEE3-4DD3-986A-3F46DD1BF41B}.Debug|x64.Build.0 = Debug|Any CPU
-		{C0E44558-FEE3-4DD3-986A-3F46DD1BF41B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C0E44558-FEE3-4DD3-986A-3F46DD1BF41B}.Debug|x86.Build.0 = Debug|Any CPU
-		{C0E44558-FEE3-4DD3-986A-3F46DD1BF41B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C0E44558-FEE3-4DD3-986A-3F46DD1BF41B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C0E44558-FEE3-4DD3-986A-3F46DD1BF41B}.Release|x64.ActiveCfg = Release|Any CPU
-		{C0E44558-FEE3-4DD3-986A-3F46DD1BF41B}.Release|x64.Build.0 = Release|Any CPU
-		{C0E44558-FEE3-4DD3-986A-3F46DD1BF41B}.Release|x86.ActiveCfg = Release|Any CPU
-		{C0E44558-FEE3-4DD3-986A-3F46DD1BF41B}.Release|x86.Build.0 = Release|Any CPU
 		{BA4D889D-066B-4C2C-A973-09E319CBC396}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BA4D889D-066B-4C2C-A973-09E319CBC396}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BA4D889D-066B-4C2C-A973-09E319CBC396}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1097,7 +1083,6 @@ Global
 		{DA50FC92-7FE7-48B5-BDB6-CDA57B37BB51} = {864062D3-A415-4A6F-9324-5820237BA058}
 		{4EFCED6E-9A6B-453A-94E4-CE4B736EC684} = {864062D3-A415-4A6F-9324-5820237BA058}
 		{D8E14B43-E929-4C18-9FA6-2C3DC47EFC17} = {864062D3-A415-4A6F-9324-5820237BA058}
-		{C0E44558-FEE3-4DD3-986A-3F46DD1BF41B} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
 		{BA4D889D-066B-4C2C-A973-09E319CBC396} = {E351F97D-EA4F-4E7F-AAA0-8EBB1F2A4A62}
 		{A39B6D7C-6616-40D6-8AE4-C6CEE93D2708} = {CAB438D8-B0F5-4AF0-BEBD-9E2ADBD7B483}
 		{5E806C9F-1B67-4B6B-A6AB-258834250DBB} = {FFCF518F-2A4A-40A2-9174-2EE13B76C723}
diff --git a/external/Java.Interop b/external/Java.Interop
index 8d544738ad2..6ec1345165f 160000
--- a/external/Java.Interop
+++ b/external/Java.Interop
@@ -1 +1 @@
-Subproject commit 8d544738ad294b4faf13d189eeeb02f0313e00b3
+Subproject commit 6ec1345165fa7385c935f16ccaa8cc38be50a080
diff --git a/src/Mono.Android/Microsoft.Android.Runtime/ManagedTypeManager.cs b/src/Mono.Android/Microsoft.Android.Runtime/ManagedTypeManager.cs
index db254b65bb8..85768bcc33d 100644
--- a/src/Mono.Android/Microsoft.Android.Runtime/ManagedTypeManager.cs
+++ b/src/Mono.Android/Microsoft.Android.Runtime/ManagedTypeManager.cs
@@ -45,6 +45,7 @@ public ManagedTypeManager ()
 	[UnconditionalSuppressMessage ("Trimming", "IL2057", Justification = "Type.GetType() can never statically know the string value parsed from parameter 'methods'.")]
 	[UnconditionalSuppressMessage ("Trimming", "IL2067", Justification = "Delegate.CreateDelegate() can never statically know the string value parsed from parameter 'methods'.")]
 	[UnconditionalSuppressMessage ("Trimming", "IL2072", Justification = "Delegate.CreateDelegate() can never statically know the string value parsed from parameter 'methods'.")]
+	[UnconditionalSuppressMessage ("AOT", "IL3050", Justification = "JniNativeMethodRegistration[] registration path will be migrated to the blittable RegisterNatives overload in a future change.")]
 	public override void RegisterNativeMembers (
 			JniType nativeClass,
 			Type type,