Update install-and-build-with-sdk.sh to set NDK location

Author: finagolfin

.github/workflows/scripts/install-and-build-with-sdk.sh

@@ -733,13 +733,6 @@ install_android_sdk() {
         fi
     fi
 
-    # Save NDK var for build later
-    if [[ -n "${GITHUB_ENV:-}" ]]; then
-        {
-            echo "SWIFT_ANDROID_NDK_HOME=${ANDROID_NDK_HOME}"
-        } >> "$GITHUB_ENV"
-    fi
-    
     # run the bundled setup script with the matched toolchain in front of PATH
     # so any 'swift' it invokes resolves to the version that matches the SDK
     local toolchain_bin_dir
@@ -823,7 +816,8 @@ build() {
         alias swift='$SWIFT_EXECUTABLE_FOR_ANDROID_SDK'
 
         log "Using NDK at $ANDROID_NDK_HOME"
-    
+        
+        echo "ANDROID_NDK_HOME=${ANDROID_NDK_HOME}" >> $GITHUB_ENV
         # This can become a single invocation in the future when `swift build` supports multiple Android triples at once
         for android_sdk_triple in "${ANDROID_SDK_TRIPLES[@]}" ; do
             if [[ "$SWIFT_VERSION_INPUT" == "6.3" || "$SWIFT_VERSION_INPUT" == "nightly-6.3" ]]; then