[glib: 2/2] Merge branch 'ci-android' into 'main'

[Philip Withnall <pwithnall src gnome org>]

commit 9a1b0f17d83ee20fdfb42f6baafac7ba0d2e6ce0
Merge: d59f2efbdd 3a8622c9e1
Author: Philip Withnall <philip tecnocode co uk>
Date:   Wed May 11 10:11:11 2022 +0000

    Merge branch 'ci-android' into 'main'
    
    ci: Update to latest Android NDK
    
    Closes #2605
    
    See merge request GNOME/glib!2623

 .gitlab-ci.yml                                     |  9 +--
 .gitlab-ci/android-ndk.Dockerfile                  | 87 ----------------------
 .../{android-download-ndk.sh => android-ndk.sh}    | 15 ++--
 .gitlab-ci/android-setup-env.sh                    | 87 ----------------------
 .gitlab-ci/cross_file_android_arm64_31.txt         | 20 +++++
 .gitlab-ci/fedora.Dockerfile                       |  3 +
 6 files changed, 35 insertions(+), 186 deletions(-)
---