diff --git a/build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs b/build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs
index a49930c8acb..7e7e1552dae 100644
--- a/build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs
+++ b/build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs
@@ -5,8 +5,8 @@ namespace Xamarin.Android.Prepare
 {
 	class BuildAndroidPlatforms
 	{
-		public const string AndroidNdkVersion = "24";
-		public const string AndroidNdkPkgRevision = "24.0.8215888";
+		public const string AndroidNdkVersion = "25";
+		public const string AndroidNdkPkgRevision = "25.0.8775105";
 		public const int NdkMinimumAPI = 21;
 		public const int NdkMinimumAPILegacy32 = 19;
 
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc
index 9904b1fe46d..e96c7f00f43 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc
@@ -8,7 +8,7 @@
       "Size": 58756
     },
     "assemblies/Mono.Android.dll": {
-      "Size": 88005
+      "Size": 87933
     },
     "assemblies/rc.bin": {
       "Size": 1129
@@ -20,19 +20,19 @@
       "Size": 9083
     },
     "assemblies/System.Private.CoreLib.dll": {
-      "Size": 473327
+      "Size": 473290
     },
     "assemblies/System.Runtime.dll": {
       "Size": 2379
     },
     "assemblies/UnnamedProject.dll": {
-      "Size": 3602
+      "Size": 3597
     },
     "classes.dex": {
       "Size": 360744
     },
     "lib/arm64-v8a/libmonodroid.so": {
-      "Size": 512648
+      "Size": 425336
     },
     "lib/arm64-v8a/libmonosgen-2.0.so": {
       "Size": 3084552
@@ -47,7 +47,7 @@
       "Size": 148696
     },
     "lib/arm64-v8a/libxamarin-app.so": {
-      "Size": 9528
+      "Size": 9488
     },
     "META-INF/BNDLTOOL.RSA": {
       "Size": 1213
@@ -59,7 +59,7 @@
       "Size": 2443
     },
     "res/drawable-hdpi-v4/icon.png": {
-      "Size": 4762
+      "Size": 4791
     },
     "res/drawable-mdpi-v4/icon.png": {
       "Size": 2200
@@ -83,5 +83,5 @@
       "Size": 1904
     }
   },
-  "PackageSize": 2680799
+  "PackageSize": 2648031
 }
\ No newline at end of file
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleLegacy.apkdesc b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleLegacy.apkdesc
index 7d614bb3f3d..ac323f1cebb 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleLegacy.apkdesc
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleLegacy.apkdesc
@@ -5,22 +5,22 @@
       "Size": 2604
     },
     "assemblies/Java.Interop.dll": {
-      "Size": 68903
+      "Size": 68921
     },
     "assemblies/Mono.Android.dll": {
-      "Size": 259892
+      "Size": 259883
     },
     "assemblies/mscorlib.dll": {
       "Size": 769017
     },
     "assemblies/System.Core.dll": {
-      "Size": 28198
+      "Size": 28199
     },
     "assemblies/System.dll": {
-      "Size": 9180
+      "Size": 9179
     },
     "assemblies/UnnamedProject.dll": {
-      "Size": 2881
+      "Size": 2877
     },
     "classes.dex": {
       "Size": 362940
@@ -32,13 +32,13 @@
       "Size": 750976
     },
     "lib/arm64-v8a/libmonodroid.so": {
-      "Size": 423048
+      "Size": 332128
     },
     "lib/arm64-v8a/libmonosgen-2.0.so": {
       "Size": 4051864
     },
     "lib/arm64-v8a/libxa-internal-api.so": {
-      "Size": 65512
+      "Size": 66184
     },
     "lib/arm64-v8a/libxamarin-app.so": {
       "Size": 20240
@@ -74,5 +74,5 @@
       "Size": 1724
     }
   },
-  "PackageSize": 4060884
+  "PackageSize": 4028116
 }
\ No newline at end of file
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc
index 070b93eb68e..21c9b5ca0f6 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc
@@ -11,7 +11,7 @@
       "Size": 66630
     },
     "assemblies/Mono.Android.dll": {
-      "Size": 442072
+      "Size": 441986
     },
     "assemblies/mscorlib.dll": {
       "Size": 3849
@@ -83,7 +83,7 @@
       "Size": 8095
     },
     "assemblies/System.Private.CoreLib.dll": {
-      "Size": 808212
+      "Size": 808082
     },
     "assemblies/System.Private.DataContractSerialization.dll": {
       "Size": 184896
@@ -122,7 +122,7 @@
       "Size": 1846
     },
     "assemblies/UnnamedProject.dll": {
-      "Size": 117277
+      "Size": 117278
     },
     "assemblies/Xamarin.AndroidX.Activity.dll": {
       "Size": 5872
@@ -194,7 +194,7 @@
       "Size": 3473216
     },
     "lib/arm64-v8a/libmonodroid.so": {
-      "Size": 512648
+      "Size": 425336
     },
     "lib/arm64-v8a/libmonosgen-2.0.so": {
       "Size": 3084552
@@ -209,7 +209,7 @@
       "Size": 148696
     },
     "lib/arm64-v8a/libxamarin-app.so": {
-      "Size": 98952
+      "Size": 98912
     },
     "META-INF/android.support.design_material.version": {
       "Size": 12
@@ -776,7 +776,7 @@
       "Size": 470
     },
     "res/drawable-hdpi-v4/icon.png": {
-      "Size": 4762
+      "Size": 4791
     },
     "res/drawable-hdpi-v4/notification_bg_low_normal.9.png": {
       "Size": 212
@@ -1964,5 +1964,5 @@
       "Size": 341228
     }
   },
-  "PackageSize": 8040857
+  "PackageSize": 8008089
 }
\ No newline at end of file
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsLegacy.apkdesc b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsLegacy.apkdesc
index 07eddec2ddc..4498b397cca 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsLegacy.apkdesc
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsLegacy.apkdesc
@@ -8,10 +8,10 @@
       "Size": 7215
     },
     "assemblies/Java.Interop.dll": {
-      "Size": 69921
+      "Size": 69945
     },
     "assemblies/Mono.Android.dll": {
-      "Size": 570610
+      "Size": 570605
     },
     "assemblies/Mono.Security.dll": {
       "Size": 68433
@@ -32,7 +32,7 @@
       "Size": 110693
     },
     "assemblies/System.Numerics.dll": {
-      "Size": 15683
+      "Size": 15682
     },
     "assemblies/System.Runtime.Serialization.dll": {
       "Size": 186660
@@ -44,7 +44,7 @@
       "Size": 395656
     },
     "assemblies/UnnamedProject.dll": {
-      "Size": 116898
+      "Size": 116896
     },
     "assemblies/Xamarin.AndroidX.Activity.dll": {
       "Size": 7697
@@ -86,7 +86,7 @@
       "Size": 13585
     },
     "assemblies/Xamarin.AndroidX.RecyclerView.dll": {
-      "Size": 102326
+      "Size": 102327
     },
     "assemblies/Xamarin.AndroidX.SavedState.dll": {
       "Size": 6268
@@ -95,7 +95,7 @@
       "Size": 11272
     },
     "assemblies/Xamarin.AndroidX.ViewPager.dll": {
-      "Size": 19424
+      "Size": 19423
     },
     "assemblies/Xamarin.Forms.Core.dll": {
       "Size": 524736
@@ -122,13 +122,13 @@
       "Size": 750976
     },
     "lib/arm64-v8a/libmonodroid.so": {
-      "Size": 423048
+      "Size": 332128
     },
     "lib/arm64-v8a/libmonosgen-2.0.so": {
       "Size": 4051864
     },
     "lib/arm64-v8a/libxa-internal-api.so": {
-      "Size": 65512
+      "Size": 66184
     },
     "lib/arm64-v8a/libxamarin-app.so": {
       "Size": 105288
@@ -1883,5 +1883,5 @@
       "Size": 341040
     }
   },
-  "PackageSize": 9582750
+  "PackageSize": 9545886
 }
\ No newline at end of file
diff --git a/tests/apk-sizes-reference/Xamarin.Forms_Performance_Integration-Signed-Release-Aot.apkdesc b/tests/apk-sizes-reference/Xamarin.Forms_Performance_Integration-Signed-Release-Aot.apkdesc
index 1bc5eebc73c..55d0edc372f 100644
--- a/tests/apk-sizes-reference/Xamarin.Forms_Performance_Integration-Signed-Release-Aot.apkdesc
+++ b/tests/apk-sizes-reference/Xamarin.Forms_Performance_Integration-Signed-Release-Aot.apkdesc
@@ -8,16 +8,16 @@
       "Size": 7199
     },
     "assemblies/Java.Interop.dll": {
-      "Size": 68911
+      "Size": 69914
     },
     "assemblies/Mono.Android.dll": {
-      "Size": 565815
+      "Size": 568806
     },
     "assemblies/Mono.Security.dll": {
       "Size": 68437
     },
     "assemblies/mscorlib.dll": {
-      "Size": 936222
+      "Size": 936223
     },
     "assemblies/Newtonsoft.Json.dll": {
       "Size": 319336
@@ -29,10 +29,10 @@
       "Size": 10201
     },
     "assemblies/System.Core.dll": {
-      "Size": 192216
+      "Size": 192217
     },
     "assemblies/System.Data.dll": {
-      "Size": 316112
+      "Size": 316113
     },
     "assemblies/System.dll": {
       "Size": 443206
@@ -41,7 +41,7 @@
       "Size": 16351
     },
     "assemblies/System.Net.Http.dll": {
-      "Size": 113294
+      "Size": 113322
     },
     "assemblies/System.Numerics.dll": {
       "Size": 23262
@@ -113,10 +113,10 @@
       "Size": 471887
     },
     "assemblies/Xamarin.Forms.Performance.Integration.dll": {
-      "Size": 22005
+      "Size": 22006
     },
     "assemblies/Xamarin.Forms.Performance.Integration.Droid.dll": {
-      "Size": 114916
+      "Size": 114914
     },
     "assemblies/Xamarin.Forms.Platform.Android.dll": {
       "Size": 367737
@@ -131,16 +131,16 @@
       "Size": 43506
     },
     "classes.dex": {
-      "Size": 2636860
+      "Size": 2649692
     },
     "lib/armeabi-v7a/libaot-FormsViewGroup.dll.so": {
-      "Size": 16532
+      "Size": 16540
     },
     "lib/armeabi-v7a/libaot-Java.Interop.dll.so": {
-      "Size": 354844
+      "Size": 361492
     },
     "lib/armeabi-v7a/libaot-Mono.Android.dll.so": {
-      "Size": 2747252
+      "Size": 2756876
     },
     "lib/armeabi-v7a/libaot-Mono.Security.dll.so": {
       "Size": 209580
@@ -170,7 +170,7 @@
       "Size": 36444
     },
     "lib/armeabi-v7a/libaot-System.Net.Http.dll.so": {
-      "Size": 528748
+      "Size": 528772
     },
     "lib/armeabi-v7a/libaot-System.Numerics.dll.so": {
       "Size": 86676
@@ -191,22 +191,22 @@
       "Size": 16836
     },
     "lib/armeabi-v7a/libaot-Xamarin.AndroidX.AppCompat.dll.so": {
-      "Size": 594076
+      "Size": 594100
     },
     "lib/armeabi-v7a/libaot-Xamarin.AndroidX.AppCompat.Resources.dll.so": {
       "Size": 13892
     },
     "lib/armeabi-v7a/libaot-Xamarin.AndroidX.CardView.dll.so": {
-      "Size": 18596
+      "Size": 18604
     },
     "lib/armeabi-v7a/libaot-Xamarin.AndroidX.CoordinatorLayout.dll.so": {
-      "Size": 78844
+      "Size": 78852
     },
     "lib/armeabi-v7a/libaot-Xamarin.AndroidX.Core.dll.so": {
-      "Size": 628276
+      "Size": 628284
     },
     "lib/armeabi-v7a/libaot-Xamarin.AndroidX.DrawerLayout.dll.so": {
-      "Size": 56772
+      "Size": 56780
     },
     "lib/armeabi-v7a/libaot-Xamarin.AndroidX.Fragment.dll.so": {
       "Size": 180524
@@ -227,16 +227,16 @@
       "Size": 40708
     },
     "lib/armeabi-v7a/libaot-Xamarin.AndroidX.RecyclerView.dll.so": {
-      "Size": 474044
+      "Size": 474052
     },
     "lib/armeabi-v7a/libaot-Xamarin.AndroidX.SavedState.dll.so": {
       "Size": 10796
     },
     "lib/armeabi-v7a/libaot-Xamarin.AndroidX.SwipeRefreshLayout.dll.so": {
-      "Size": 30652
+      "Size": 30660
     },
     "lib/armeabi-v7a/libaot-Xamarin.AndroidX.ViewPager.dll.so": {
-      "Size": 70780
+      "Size": 70788
     },
     "lib/armeabi-v7a/libaot-Xamarin.Forms.Core.dll.so": {
       "Size": 2220140
@@ -248,7 +248,7 @@
       "Size": 218340
     },
     "lib/armeabi-v7a/libaot-Xamarin.Forms.Platform.Android.dll.so": {
-      "Size": 1486220
+      "Size": 1486492
     },
     "lib/armeabi-v7a/libaot-Xamarin.Forms.Platform.dll.so": {
       "Size": 108084
@@ -257,7 +257,7 @@
       "Size": 228116
     },
     "lib/armeabi-v7a/libaot-Xamarin.Google.Android.Material.dll.so": {
-      "Size": 201612
+      "Size": 201660
     },
     "lib/armeabi-v7a/libmono-btls-shared.so": {
       "Size": 1112688
@@ -266,25 +266,25 @@
       "Size": 785140
     },
     "lib/armeabi-v7a/libmonodroid.so": {
-      "Size": 312824
+      "Size": 269516
     },
     "lib/armeabi-v7a/libmonosgen-2.0.so": {
-      "Size": 4456612
+      "Size": 4456580
     },
     "lib/armeabi-v7a/libxa-internal-api.so": {
-      "Size": 48812
+      "Size": 49004
     },
     "lib/armeabi-v7a/libxamarin-app.so": {
-      "Size": 87604
+      "Size": 87900
     },
     "lib/x86/libaot-FormsViewGroup.dll.so": {
-      "Size": 14776
+      "Size": 14784
     },
     "lib/x86/libaot-Java.Interop.dll.so": {
-      "Size": 312032
+      "Size": 317768
     },
     "lib/x86/libaot-Mono.Android.dll.so": {
-      "Size": 2411712
+      "Size": 2420192
     },
     "lib/x86/libaot-Mono.Security.dll.so": {
       "Size": 178224
@@ -314,7 +314,7 @@
       "Size": 33368
     },
     "lib/x86/libaot-System.Net.Http.dll.so": {
-      "Size": 452264
+      "Size": 452200
     },
     "lib/x86/libaot-System.Numerics.dll.so": {
       "Size": 74208
@@ -335,22 +335,22 @@
       "Size": 14856
     },
     "lib/x86/libaot-Xamarin.AndroidX.AppCompat.dll.so": {
-      "Size": 528160
+      "Size": 528184
     },
     "lib/x86/libaot-Xamarin.AndroidX.AppCompat.Resources.dll.so": {
       "Size": 12336
     },
     "lib/x86/libaot-Xamarin.AndroidX.CardView.dll.so": {
-      "Size": 16080
+      "Size": 16088
     },
     "lib/x86/libaot-Xamarin.AndroidX.CoordinatorLayout.dll.so": {
-      "Size": 67664
+      "Size": 67672
     },
     "lib/x86/libaot-Xamarin.AndroidX.Core.dll.so": {
-      "Size": 568016
+      "Size": 568024
     },
     "lib/x86/libaot-Xamarin.AndroidX.DrawerLayout.dll.so": {
-      "Size": 49336
+      "Size": 49344
     },
     "lib/x86/libaot-Xamarin.AndroidX.Fragment.dll.so": {
       "Size": 158080
@@ -371,16 +371,16 @@
       "Size": 35152
     },
     "lib/x86/libaot-Xamarin.AndroidX.RecyclerView.dll.so": {
-      "Size": 416608
+      "Size": 416616
     },
     "lib/x86/libaot-Xamarin.AndroidX.SavedState.dll.so": {
       "Size": 9712
     },
     "lib/x86/libaot-Xamarin.AndroidX.SwipeRefreshLayout.dll.so": {
-      "Size": 26664
+      "Size": 26672
     },
     "lib/x86/libaot-Xamarin.AndroidX.ViewPager.dll.so": {
-      "Size": 60848
+      "Size": 60856
     },
     "lib/x86/libaot-Xamarin.Forms.Core.dll.so": {
       "Size": 1834992
@@ -392,7 +392,7 @@
       "Size": 134096
     },
     "lib/x86/libaot-Xamarin.Forms.Platform.Android.dll.so": {
-      "Size": 1207944
+      "Size": 1208216
     },
     "lib/x86/libaot-Xamarin.Forms.Platform.dll.so": {
       "Size": 67640
@@ -401,7 +401,7 @@
       "Size": 184168
     },
     "lib/x86/libaot-Xamarin.Google.Android.Material.dll.so": {
-      "Size": 178320
+      "Size": 178368
     },
     "lib/x86/libmono-btls-shared.so": {
       "Size": 1459584
@@ -410,16 +410,16 @@
       "Size": 823560
     },
     "lib/x86/libmonodroid.so": {
-      "Size": 414704
+      "Size": 338556
     },
     "lib/x86/libmonosgen-2.0.so": {
       "Size": 4212360
     },
     "lib/x86/libxa-internal-api.so": {
-      "Size": 60848
+      "Size": 61056
     },
     "lib/x86/libxamarin-app.so": {
-      "Size": 86400
+      "Size": 86696
     },
     "META-INF/android.support.design_material.version": {
       "Size": 12
@@ -2243,5 +2243,5 @@
       "Size": 347268
     }
   },
-  "PackageSize": 26977476
+  "PackageSize": 26920132
 }
\ No newline at end of file
diff --git a/tests/apk-sizes-reference/Xamarin.Forms_Performance_Integration-Signed-Release-Bundle.apkdesc b/tests/apk-sizes-reference/Xamarin.Forms_Performance_Integration-Signed-Release-Bundle.apkdesc
index 09f4f7d5ea0..1a00cd9672e 100644
--- a/tests/apk-sizes-reference/Xamarin.Forms_Performance_Integration-Signed-Release-Bundle.apkdesc
+++ b/tests/apk-sizes-reference/Xamarin.Forms_Performance_Integration-Signed-Release-Bundle.apkdesc
@@ -5,7 +5,7 @@
       "Size": 3768
     },
     "classes.dex": {
-      "Size": 2964300
+      "Size": 2977160
     },
     "lib/armeabi-v7a/libmono-btls-shared.so": {
       "Size": 1112688
@@ -14,19 +14,19 @@
       "Size": 785140
     },
     "lib/armeabi-v7a/libmonodroid_bundle_app.so": {
-      "Size": 4279036
+      "Size": 4282044
     },
     "lib/armeabi-v7a/libmonodroid.so": {
-      "Size": 312824
+      "Size": 269516
     },
     "lib/armeabi-v7a/libmonosgen-2.0.so": {
-      "Size": 4456612
+      "Size": 4456580
     },
     "lib/armeabi-v7a/libxa-internal-api.so": {
-      "Size": 48812
+      "Size": 49004
     },
     "lib/armeabi-v7a/libxamarin-app.so": {
-      "Size": 68936
+      "Size": 69232
     },
     "lib/x86/libmono-btls-shared.so": {
       "Size": 1459584
@@ -35,19 +35,19 @@
       "Size": 823560
     },
     "lib/x86/libmonodroid_bundle_app.so": {
-      "Size": 4278176
+      "Size": 4281540
     },
     "lib/x86/libmonodroid.so": {
-      "Size": 414704
+      "Size": 338556
     },
     "lib/x86/libmonosgen-2.0.so": {
       "Size": 4212360
     },
     "lib/x86/libxa-internal-api.so": {
-      "Size": 60848
+      "Size": 61056
     },
     "lib/x86/libxamarin-app.so": {
-      "Size": 68740
+      "Size": 69036
     },
     "META-INF/android.arch.core_runtime.version": {
       "Size": 6
@@ -2993,5 +2993,5 @@
       "Size": 493672
     }
   },
-  "PackageSize": 16500726
+  "PackageSize": 16435190
 }
\ No newline at end of file
diff --git a/tests/apk-sizes-reference/Xamarin.Forms_Performance_Integration-Signed-Release-Profiled-Aot.apkdesc b/tests/apk-sizes-reference/Xamarin.Forms_Performance_Integration-Signed-Release-Profiled-Aot.apkdesc
index bdffdf63126..b55ae2d0550 100644
--- a/tests/apk-sizes-reference/Xamarin.Forms_Performance_Integration-Signed-Release-Profiled-Aot.apkdesc
+++ b/tests/apk-sizes-reference/Xamarin.Forms_Performance_Integration-Signed-Release-Profiled-Aot.apkdesc
@@ -8,16 +8,16 @@
       "Size": 7199
     },
     "assemblies/Java.Interop.dll": {
-      "Size": 68911
+      "Size": 69914
     },
     "assemblies/Mono.Android.dll": {
-      "Size": 565815
+      "Size": 568806
     },
     "assemblies/Mono.Security.dll": {
       "Size": 68437
     },
     "assemblies/mscorlib.dll": {
-      "Size": 936222
+      "Size": 936223
     },
     "assemblies/Newtonsoft.Json.dll": {
       "Size": 319336
@@ -29,10 +29,10 @@
       "Size": 10201
     },
     "assemblies/System.Core.dll": {
-      "Size": 192216
+      "Size": 192217
     },
     "assemblies/System.Data.dll": {
-      "Size": 316112
+      "Size": 316113
     },
     "assemblies/System.dll": {
       "Size": 443206
@@ -41,7 +41,7 @@
       "Size": 16351
     },
     "assemblies/System.Net.Http.dll": {
-      "Size": 113294
+      "Size": 113322
     },
     "assemblies/System.Numerics.dll": {
       "Size": 23262
@@ -113,10 +113,10 @@
       "Size": 471887
     },
     "assemblies/Xamarin.Forms.Performance.Integration.dll": {
-      "Size": 22005
+      "Size": 22006
     },
     "assemblies/Xamarin.Forms.Performance.Integration.Droid.dll": {
-      "Size": 114916
+      "Size": 114914
     },
     "assemblies/Xamarin.Forms.Platform.Android.dll": {
       "Size": 367737
@@ -131,16 +131,16 @@
       "Size": 43506
     },
     "classes.dex": {
-      "Size": 2636860
+      "Size": 2649692
     },
     "lib/armeabi-v7a/libaot-FormsViewGroup.dll.so": {
-      "Size": 10452
+      "Size": 10460
     },
     "lib/armeabi-v7a/libaot-Java.Interop.dll.so": {
-      "Size": 138516
+      "Size": 140412
     },
     "lib/armeabi-v7a/libaot-Mono.Android.dll.so": {
-      "Size": 638228
+      "Size": 637340
     },
     "lib/armeabi-v7a/libaot-Mono.Security.dll.so": {
       "Size": 17332
@@ -170,7 +170,7 @@
       "Size": 3756
     },
     "lib/armeabi-v7a/libaot-System.Net.Http.dll.so": {
-      "Size": 53532
+      "Size": 53540
     },
     "lib/armeabi-v7a/libaot-System.Numerics.dll.so": {
       "Size": 5692
@@ -191,22 +191,22 @@
       "Size": 5228
     },
     "lib/armeabi-v7a/libaot-Xamarin.AndroidX.AppCompat.dll.so": {
-      "Size": 81716
+      "Size": 81740
     },
     "lib/armeabi-v7a/libaot-Xamarin.AndroidX.AppCompat.Resources.dll.so": {
       "Size": 3620
     },
     "lib/armeabi-v7a/libaot-Xamarin.AndroidX.CardView.dll.so": {
-      "Size": 4916
+      "Size": 4924
     },
     "lib/armeabi-v7a/libaot-Xamarin.AndroidX.CoordinatorLayout.dll.so": {
-      "Size": 12316
+      "Size": 12324
     },
     "lib/armeabi-v7a/libaot-Xamarin.AndroidX.Core.dll.so": {
-      "Size": 63244
+      "Size": 63252
     },
     "lib/armeabi-v7a/libaot-Xamarin.AndroidX.DrawerLayout.dll.so": {
-      "Size": 14828
+      "Size": 14836
     },
     "lib/armeabi-v7a/libaot-Xamarin.AndroidX.Fragment.dll.so": {
       "Size": 30428
@@ -227,16 +227,16 @@
       "Size": 6620
     },
     "lib/armeabi-v7a/libaot-Xamarin.AndroidX.RecyclerView.dll.so": {
-      "Size": 70076
+      "Size": 70084
     },
     "lib/armeabi-v7a/libaot-Xamarin.AndroidX.SavedState.dll.so": {
       "Size": 3644
     },
     "lib/armeabi-v7a/libaot-Xamarin.AndroidX.SwipeRefreshLayout.dll.so": {
-      "Size": 10756
+      "Size": 10764
     },
     "lib/armeabi-v7a/libaot-Xamarin.AndroidX.ViewPager.dll.so": {
-      "Size": 16172
+      "Size": 16180
     },
     "lib/armeabi-v7a/libaot-Xamarin.Forms.Core.dll.so": {
       "Size": 968780
@@ -248,7 +248,7 @@
       "Size": 218340
     },
     "lib/armeabi-v7a/libaot-Xamarin.Forms.Platform.Android.dll.so": {
-      "Size": 710588
+      "Size": 710860
     },
     "lib/armeabi-v7a/libaot-Xamarin.Forms.Platform.dll.so": {
       "Size": 106796
@@ -257,7 +257,7 @@
       "Size": 38436
     },
     "lib/armeabi-v7a/libaot-Xamarin.Google.Android.Material.dll.so": {
-      "Size": 35500
+      "Size": 35548
     },
     "lib/armeabi-v7a/libmono-btls-shared.so": {
       "Size": 1112688
@@ -266,25 +266,25 @@
       "Size": 785140
     },
     "lib/armeabi-v7a/libmonodroid.so": {
-      "Size": 312824
+      "Size": 269516
     },
     "lib/armeabi-v7a/libmonosgen-2.0.so": {
-      "Size": 4456612
+      "Size": 4456580
     },
     "lib/armeabi-v7a/libxa-internal-api.so": {
-      "Size": 48812
+      "Size": 49004
     },
     "lib/armeabi-v7a/libxamarin-app.so": {
-      "Size": 87604
+      "Size": 87900
     },
     "lib/x86/libaot-FormsViewGroup.dll.so": {
-      "Size": 9648
+      "Size": 9656
     },
     "lib/x86/libaot-Java.Interop.dll.so": {
-      "Size": 112832
+      "Size": 114104
     },
     "lib/x86/libaot-Mono.Android.dll.so": {
-      "Size": 468600
+      "Size": 467472
     },
     "lib/x86/libaot-Mono.Security.dll.so": {
       "Size": 11272
@@ -314,7 +314,7 @@
       "Size": 3168
     },
     "lib/x86/libaot-System.Net.Http.dll.so": {
-      "Size": 36656
+      "Size": 36664
     },
     "lib/x86/libaot-System.Numerics.dll.so": {
       "Size": 3984
@@ -335,22 +335,22 @@
       "Size": 4440
     },
     "lib/x86/libaot-Xamarin.AndroidX.AppCompat.dll.so": {
-      "Size": 52568
+      "Size": 52592
     },
     "lib/x86/libaot-Xamarin.AndroidX.AppCompat.Resources.dll.so": {
       "Size": 3144
     },
     "lib/x86/libaot-Xamarin.AndroidX.CardView.dll.so": {
-      "Size": 4216
+      "Size": 4224
     },
     "lib/x86/libaot-Xamarin.AndroidX.CoordinatorLayout.dll.so": {
-      "Size": 9560
+      "Size": 9568
     },
     "lib/x86/libaot-Xamarin.AndroidX.Core.dll.so": {
-      "Size": 35880
+      "Size": 35888
     },
     "lib/x86/libaot-Xamarin.AndroidX.DrawerLayout.dll.so": {
-      "Size": 11976
+      "Size": 11984
     },
     "lib/x86/libaot-Xamarin.AndroidX.Fragment.dll.so": {
       "Size": 21336
@@ -371,16 +371,16 @@
       "Size": 4648
     },
     "lib/x86/libaot-Xamarin.AndroidX.RecyclerView.dll.so": {
-      "Size": 46464
+      "Size": 46472
     },
     "lib/x86/libaot-Xamarin.AndroidX.SavedState.dll.so": {
       "Size": 3192
     },
     "lib/x86/libaot-Xamarin.AndroidX.SwipeRefreshLayout.dll.so": {
-      "Size": 8896
+      "Size": 8904
     },
     "lib/x86/libaot-Xamarin.AndroidX.ViewPager.dll.so": {
-      "Size": 12440
+      "Size": 12448
     },
     "lib/x86/libaot-Xamarin.Forms.Core.dll.so": {
       "Size": 765800
@@ -392,7 +392,7 @@
       "Size": 134096
     },
     "lib/x86/libaot-Xamarin.Forms.Platform.Android.dll.so": {
-      "Size": 548928
+      "Size": 549200
     },
     "lib/x86/libaot-Xamarin.Forms.Platform.dll.so": {
       "Size": 65512
@@ -401,7 +401,7 @@
       "Size": 27536
     },
     "lib/x86/libaot-Xamarin.Google.Android.Material.dll.so": {
-      "Size": 26216
+      "Size": 26264
     },
     "lib/x86/libmono-btls-shared.so": {
       "Size": 1459584
@@ -410,16 +410,16 @@
       "Size": 823560
     },
     "lib/x86/libmonodroid.so": {
-      "Size": 414704
+      "Size": 338556
     },
     "lib/x86/libmonosgen-2.0.so": {
       "Size": 4212360
     },
     "lib/x86/libxa-internal-api.so": {
-      "Size": 60848
+      "Size": 61056
     },
     "lib/x86/libxamarin-app.so": {
-      "Size": 86400
+      "Size": 86696
     },
     "META-INF/android.support.design_material.version": {
       "Size": 12
@@ -2243,5 +2243,5 @@
       "Size": 347268
     }
   },
-  "PackageSize": 16164036
+  "PackageSize": 16098500
 }
\ No newline at end of file
diff --git a/tests/apk-sizes-reference/Xamarin.Forms_Performance_Integration-Signed-Release.apkdesc b/tests/apk-sizes-reference/Xamarin.Forms_Performance_Integration-Signed-Release.apkdesc
index 7246241cf20..d4fba138086 100644
--- a/tests/apk-sizes-reference/Xamarin.Forms_Performance_Integration-Signed-Release.apkdesc
+++ b/tests/apk-sizes-reference/Xamarin.Forms_Performance_Integration-Signed-Release.apkdesc
@@ -8,16 +8,16 @@
       "Size": 7199
     },
     "assemblies/Java.Interop.dll": {
-      "Size": 68911
+      "Size": 69914
     },
     "assemblies/Mono.Android.dll": {
-      "Size": 565815
+      "Size": 568806
     },
     "assemblies/Mono.Security.dll": {
       "Size": 68437
     },
     "assemblies/mscorlib.dll": {
-      "Size": 936222
+      "Size": 936223
     },
     "assemblies/Newtonsoft.Json.dll": {
       "Size": 319336
@@ -29,10 +29,10 @@
       "Size": 10201
     },
     "assemblies/System.Core.dll": {
-      "Size": 192216
+      "Size": 192217
     },
     "assemblies/System.Data.dll": {
-      "Size": 316112
+      "Size": 316113
     },
     "assemblies/System.dll": {
       "Size": 443206
@@ -41,7 +41,7 @@
       "Size": 16351
     },
     "assemblies/System.Net.Http.dll": {
-      "Size": 113294
+      "Size": 113322
     },
     "assemblies/System.Numerics.dll": {
       "Size": 23262
@@ -113,10 +113,10 @@
       "Size": 471887
     },
     "assemblies/Xamarin.Forms.Performance.Integration.dll": {
-      "Size": 22005
+      "Size": 22006
     },
     "assemblies/Xamarin.Forms.Performance.Integration.Droid.dll": {
-      "Size": 114916
+      "Size": 114914
     },
     "assemblies/Xamarin.Forms.Platform.Android.dll": {
       "Size": 367737
@@ -131,7 +131,7 @@
       "Size": 43506
     },
     "classes.dex": {
-      "Size": 2636860
+      "Size": 2649692
     },
     "lib/armeabi-v7a/libmono-btls-shared.so": {
       "Size": 1112688
@@ -140,16 +140,16 @@
       "Size": 785140
     },
     "lib/armeabi-v7a/libmonodroid.so": {
-      "Size": 312824
+      "Size": 269516
     },
     "lib/armeabi-v7a/libmonosgen-2.0.so": {
-      "Size": 4456612
+      "Size": 4456580
     },
     "lib/armeabi-v7a/libxa-internal-api.so": {
-      "Size": 48812
+      "Size": 49004
     },
     "lib/armeabi-v7a/libxamarin-app.so": {
-      "Size": 77908
+      "Size": 78204
     },
     "lib/x86/libmono-btls-shared.so": {
       "Size": 1459584
@@ -158,16 +158,16 @@
       "Size": 823560
     },
     "lib/x86/libmonodroid.so": {
-      "Size": 414704
+      "Size": 338556
     },
     "lib/x86/libmonosgen-2.0.so": {
       "Size": 4212360
     },
     "lib/x86/libxa-internal-api.so": {
-      "Size": 60848
+      "Size": 61056
     },
     "lib/x86/libxamarin-app.so": {
-      "Size": 77712
+      "Size": 78008
     },
     "META-INF/android.support.design_material.version": {
       "Size": 12
@@ -1991,5 +1991,5 @@
       "Size": 347268
     }
   },
-  "PackageSize": 13104480
+  "PackageSize": 13038944
 }
\ No newline at end of file
diff --git a/tests/apk-sizes-reference/com.companyname.vsandroidapp-Signed-Release.apkdesc b/tests/apk-sizes-reference/com.companyname.vsandroidapp-Signed-Release.apkdesc
index 9916ab6bd54..38b002eea95 100644
--- a/tests/apk-sizes-reference/com.companyname.vsandroidapp-Signed-Release.apkdesc
+++ b/tests/apk-sizes-reference/com.companyname.vsandroidapp-Signed-Release.apkdesc
@@ -5,13 +5,13 @@
       "Size": 2832
     },
     "assemblies/assemblies.blob": {
-      "Size": 2032015
+      "Size": 2035864
     },
     "assemblies/assemblies.manifest": {
       "Size": 1574
     },
     "classes.dex": {
-      "Size": 2923320
+      "Size": 2936276
     },
     "lib/armeabi-v7a/libmono-btls-shared.so": {
       "Size": 1112688
@@ -20,16 +20,16 @@
       "Size": 785140
     },
     "lib/armeabi-v7a/libmonodroid.so": {
-      "Size": 311756
+      "Size": 269516
     },
     "lib/armeabi-v7a/libmonosgen-2.0.so": {
-      "Size": 4456612
+      "Size": 4456580
     },
     "lib/armeabi-v7a/libxa-internal-api.so": {
-      "Size": 48812
+      "Size": 49004
     },
     "lib/armeabi-v7a/libxamarin-app.so": {
-      "Size": 30276
+      "Size": 30572
     },
     "lib/x86/libmono-btls-shared.so": {
       "Size": 1459584
@@ -38,16 +38,16 @@
       "Size": 823560
     },
     "lib/x86/libmonodroid.so": {
-      "Size": 413476
+      "Size": 338556
     },
     "lib/x86/libmonosgen-2.0.so": {
       "Size": 4212360
     },
     "lib/x86/libxa-internal-api.so": {
-      "Size": 60848
+      "Size": 61056
     },
     "lib/x86/libxamarin-app.so": {
-      "Size": 30080
+      "Size": 30376
     },
     "META-INF/android.arch.core_runtime.version": {
       "Size": 6
@@ -1610,5 +1610,5 @@
       "Size": 320016
     }
   },
-  "PackageSize": 9603081
+  "PackageSize": 9537545
 }
\ No newline at end of file