ci/android: download S3_ANDROID_ARTIFACT_NAME in cuttlefish-runner.sh

Downloading the android artifacts separately is really a peculiarity of
cuttlefish jobs, where we need mesa artifacts for both the host and the
guest.

So move the separate download of android artifacts to
cuttlefish-runner.sh

This aligns with the .test-android definition being cuttlefish specific,
and it also matches the original comment in that definition regarding
S3_ANDROID_ARTIFACT_NAME.

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

.gitlab-ci/android-runner.sh

@@ -59,13 +59,6 @@ get_gles_runtime_version
 get_vk_runtime_device_name
 get_vk_runtime_version
 
-# download Android Mesa from S3
-curl-with-retry -O "${FDO_HTTP_CACHE_URI:-}https://${PIPELINE_ARTIFACTS_BASE}/${S3_ANDROID_ARTIFACT_NAME}.tar.zst"
-mkdir /mesa-android
-tar -C /mesa-android -xvf ${S3_ANDROID_ARTIFACT_NAME}.tar.zst
-
-INSTALL="/mesa-android/install"
-
 # replace libraries
 
 $ADB shell rm -f /vendor/lib64/libgallium_dri.so*

.gitlab-ci/cuttlefish-runner.sh

@@ -88,6 +88,14 @@ sleep 1
 
 popd
 
+# download Android Mesa from S3
+curl-with-retry -O "${FDO_HTTP_CACHE_URI:-}https://${PIPELINE_ARTIFACTS_BASE}/${S3_ANDROID_ARTIFACT_NAME}.tar.zst"
+mkdir /mesa-android
+tar -C /mesa-android -xvf ${S3_ANDROID_ARTIFACT_NAME}.tar.zst
+
+# shellcheck disable=SC2034 # used externally
+INSTALL="/mesa-android/install"
+
 # shellcheck disable=SC2034 # used externally
 ADB=adb