meson: fix deprecation warning in create-android-cross-file.sh

When running .gitlab-ci/container/debian/android_build.sh using the
cross files created by .gitlab-ci/container/create-android-cross-file.sh
meson prints out the following warning:

-----------------------------------------------------------------------
DEPRECATION: "pkgconfig" entry is deprecated and should be replaced by "pkg-config"
-----------------------------------------------------------------------

Use the suggested name `pkg-config` in the cross files to silence the
warning.

Apply the same change also to the example meson cross file in
docs/android.rst

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29431>

.gitlab-ci/container/create-android-cross-file.sh

@@ -22,7 +22,7 @@ cpp = ['ccache', '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/${arch2}${sdk_v
 c_ld = 'lld'
 cpp_ld = 'lld'
 strip = '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip'
-pkgconfig = ['/usr/bin/pkgconf']
+pkg-config = ['/usr/bin/pkgconf']
 
 [host_machine]
 system = 'android'

.gitlab-ci/image-tags.yml

@@ -16,7 +16,7 @@ variables:
    DEBIAN_BASE_TAG: "20240516-rename-arm"
 
    DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"
-   DEBIAN_BUILD_TAG: "20240509-bindgen"
+   DEBIAN_BUILD_TAG: "20240529-pkg-config"
 
    DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base"
    DEBIAN_ARM64_TEST_BASE_IMAGE: "debian/arm64_test-base"

docs/android.rst

@@ -30,7 +30,7 @@ Then, create your Meson cross file to use it, something like this
     # Android doesn't come with a pkg-config, but we need one for Meson to be happy not
     # finding all the optional deps it looks for.  Use system pkg-config pointing at a
     # directory we get to populate with any .pc files we want to add for Android
-    pkgconfig = ['env', 'PKG_CONFIG_LIBDIR=NDKDIR/pkgconfig', '/usr/bin/pkg-config']
+    pkg-config = ['env', 'PKG_CONFIG_LIBDIR=NDKDIR/pkgconfig', '/usr/bin/pkg-config']
 
     [host_machine]
     system = 'android'