Merge remote-tracking branch 'upstream/iceraven' into iceraven

Author: Burhanverse

android-components

@@ -294,15 +294,6 @@ android {
     }
 
     bundle {
-        // Profiler issues require us to temporarily package native code compressed to
-        // match the previous APK packaging.
-        // https://bugzilla.mozilla.org/show_bug.cgi?id=1865634
-        packaging {
-            jniLibs {
-                it.useLegacyPackaging = true
-            }
-        }
-
         language {
             // Because we have runtime language selection we will keep all strings and languages
             // in the base APKs.
@@ -318,14 +309,9 @@ android {
         abortOnError = false
     }
 
-    // https://issuetracker.google.com/issues/379732901
     packaging {
         resources {
-            excludes += ["META-INF/LICENSE.md", "META-INF/LICENSE-notice.md",
-                         "META-INF/versions/9/OSGI-INF/MANIFEST.MF"]
-        }
-        jniLibs {
-            useLegacyPackaging = true
+            excludes += ["META-INF/LICENSE.md", "META-INF/LICENSE-notice.md"]
         }
     }