Enable marshal methods by default, except when Blazor is used

src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.Aot.targets

@@ -143,6 +143,30 @@ They run in a context of an inner build with a single $(RuntimeIdentifier).
         SourceFiles="@(_ILStripUpdatedAssemblies)"
         DestinationFiles="@(_ILStripUpdatedAssemblies->'%(UntrimmedAssemblyFilePath)')"
     />
+    <ItemGroup>
+      <_UpdateStamp Include="@(_ILStripUpdatedAssemblies)" Condition=" '$(AndroidStripILAfterAOT)' == 'true' and '%(_ILStripUpdatedAssemblies.ILStripped)' == 'true' " />
+    </ItemGroup>
+
+    <!-- We must update the stamp file used by `_GenerateJavaStubs`, but `$(_AndroidStampDirectory)` **here** is inside a per-RID parent
+         directory (e.g. `obj/Release/android-arm64/stamp`) and not the "top level" one (`obj/Release/stamp`).  Since **both** are set
+         in the same place (in `Xamarin.Android.Common.targets`), we don't know where the "top level" one really is.  Hence the hack.
+         If the locations or their relative paths change, then the `EnableAndroidStripILAfterAOTFalse` test will fail.
+
+         However, there should be a better way to do it... Ideally, when marshal methods are enabled **nothing** should modify any
+         assemblies after marshal method classifier and rewriter runs.
+    -->
+    <PropertyGroup>
+      <_StampDir>$(_AndroidStampDirectory)\..\..\stamp</_StampDir>
+    </PropertyGroup>
+    <MakeDir
+        Condition=" '$(AndroidStripILAfterAOT)' == 'true' and '@(_UpdateStamp->Count())' &gt; 0 "
+        Directories="$(_StampDir)"
+    />
+    <Touch
+        Condition=" '$(AndroidStripILAfterAOT)' == 'true' and '@(_UpdateStamp->Count())' &gt; 0 "
+        Files="$(_StampDir)\_GenerateJavaStubs.stamp"
+        AlwaysCreate="True"
+    />
     <WriteLinesToFile
         File="$(_AndroidStampDirectory)_AndroidAot.stamp"
         Lines="@(_MonoAOTCompiledAssemblies->'%(LibraryFile)')"

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc

@@ -5,28 +5,28 @@
       "Size": 3036
     },
     "classes.dex": {
-      "Size": 377764
+      "Size": 19476
     },
     "lib/arm64-v8a/lib__Microsoft.Android.Resource.Designer.dll.so": {
       "Size": 1027
     },
     "lib/arm64-v8a/lib_Java.Interop.dll.so": {
-      "Size": 64231
+      "Size": 64655
     },
     "lib/arm64-v8a/lib_Mono.Android.dll.so": {
-      "Size": 91590
+      "Size": 92217
     },
     "lib/arm64-v8a/lib_Mono.Android.Runtime.dll.so": {
-      "Size": 5315
+      "Size": 5320
     },
     "lib/arm64-v8a/lib_System.Console.dll.so": {
-      "Size": 6539
+      "Size": 6541
     },
     "lib/arm64-v8a/lib_System.Linq.dll.so": {
-      "Size": 8525
+      "Size": 8524
     },
     "lib/arm64-v8a/lib_System.Private.CoreLib.dll.so": {
-      "Size": 570166
+      "Size": 571267
     },
     "lib/arm64-v8a/lib_System.Runtime.dll.so": {
       "Size": 2544
@@ -35,7 +35,7 @@
       "Size": 4020
     },
     "lib/arm64-v8a/lib_UnnamedProject.dll.so": {
-      "Size": 2933
+      "Size": 2931
     },
     "lib/arm64-v8a/libarc.bin.so": {
       "Size": 1586
@@ -44,10 +44,10 @@
       "Size": 87352
     },
     "lib/arm64-v8a/libmonodroid.so": {
-      "Size": 476432
+      "Size": 492104
     },
     "lib/arm64-v8a/libmonosgen-2.0.so": {
-      "Size": 3138768
+      "Size": 3154304
     },
     "lib/arm64-v8a/libSystem.Globalization.Native.so": {
       "Size": 67248
@@ -56,16 +56,16 @@
       "Size": 723560
     },
     "lib/arm64-v8a/libSystem.Native.so": {
-      "Size": 94720
+      "Size": 95296
     },
     "lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": {
       "Size": 155568
     },
     "lib/arm64-v8a/libxamarin-app.so": {
-      "Size": 12696
+      "Size": 17952
     },
     "META-INF/BNDLTOOL.RSA": {
-      "Size": 1221
+      "Size": 1223
     },
     "META-INF/BNDLTOOL.SF": {
       "Size": 3266
@@ -98,5 +98,5 @@
       "Size": 1904
     }
   },
-  "PackageSize": 2742805
+  "PackageSize": 2681365
 }