fix build.gradle and update NDK to r25c

app/build.gradle

@@ -192,6 +192,7 @@ android {
             // Use custom default allowed addon list
             buildConfigField "String", "AMO_COLLECTION_USER", "\"16201230\""
             buildConfigField "String", "AMO_COLLECTION_NAME", "\"What-I-want-on-Fenix\""
+        }
         benchmark releaseTemplate >> {
             initWith buildTypes.nightly
             applicationIdSuffix ".fenix"
@@ -498,8 +499,8 @@ nimbus {
             fenixBeta: "beta",
             fenixRelease: "release",
             fenixForkDebug: "forkDebug",
-            fenixForkRelease: "forkRelease"
-            fenixBenchmark: "developer",
+            fenixForkRelease: "forkRelease",
+            fenixBenchmark: "developer"
     ]
     // This is generated by the FML and should be checked into git.
     // It will be fetched by Experimenter (the Nimbus experiment website)

app/nimbus.fml.yaml

@@ -9,6 +9,8 @@ channels:
   - beta
   - nightly
   - developer
+  - forkDebug
+  - forkRelease
 import:
   - path: ../android-components/components/service/nimbus/messaging.fml.yaml
     channel: release

automation/iceraven/install-sdk.sh

@@ -20,7 +20,7 @@ popd
 export ANDROID_SDK_ROOT=$HOME/android-sdk/android-sdk-linux
 
 # Install the weirdly missing NDK
-${ANDROID_SDK_ROOT}/cmdline-tools/tools/bin/sdkmanager "ndk;21.0.6113669"
+${ANDROID_SDK_ROOT}/cmdline-tools/tools/bin/sdkmanager "ndk;25.2.9519653"
 
 # Point the build at the tools
 echo "sdk.dir=${ANDROID_SDK_ROOT}" >> local.properties