Merge branch 'miscfixes422' into 'master'

Misc fixes

Closes rfp#379

See merge request fdroid/fdroiddata!8256

metadata/com.standardnotes.yml

@@ -8,6 +8,8 @@ IssueTracker: https://github.com/standardnotes/mobile/issues
 
 AutoName: S. Notes
 Description: |-
+    [Note: Archived at upstream's request, see upstream issue 292]
+
     Standard Notes is a private place for your notes, thoughts, and life's work.
 
     — It's simple. Standard Notes is the easiest notes app you'll ever use. That
@@ -170,31 +172,7 @@ Builds:
       - node_modules/
       - vendor/
 
-  - versionName: 3.0.22
-    versionCode: 3000221
-    disable: fails to build
-    commit: 3.0.22
-    subdir: android/app/
-    submodules: true
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y --no-install-recommends -t stretch-backports npm
-    init: npm install
-    gradle:
-      - yes
-    rm:
-      - vendor/react-native-aes/android/build/
-    prebuild:
-      - truncate -s 0 ../../node_modules/@react-native-community/cli/build/commands/server/external/xsel
-      - sed -i -e 's/gradle-4.1/gradle-5.4.1/' gradle/wrapper/gradle-wrapper.properties
-    scanignore:
-      - android/build.gradle
-      - node_modules/react-native-screens/android/build.gradle
-      - node_modules/react-native-webview/android/build.gradle
-    scandelete:
-      - node_modules/
-      - vendor/
-
+ArchivePolicy: 0 versions
 AutoUpdateMode: None
 UpdateCheckMode: None
 CurrentVersion: 3.0.22

metadata/org.openobservatory.ooniprobe.yml

@@ -311,7 +311,7 @@ Builds:
       - stableFdroid
     prebuild: sed -i -e '/fabric/d' -e 's/21.0.6113669/21.3.6528147/' -e '/com.google.gms/d'
         ../build.gradle build.gradle
-    ndk: r21d
+    ndk: r22
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags