[android] Fix an install path and the displayed NDK in the build log (#82620)

I just noticed the install issue when cross-compiling Testing with a
freshly-built compiler, which I'd never done before. Also, fix the NDK
path shown in the CMake output.

Author: finagolfin

cmake/modules/SwiftConfigureSDK.cmake

@@ -53,7 +53,7 @@ function(_report_sdk prefix)
     endforeach()
   elseif("${prefix}" STREQUAL "ANDROID")
     if(NOT "${SWIFT_ANDROID_NDK_PATH}" STREQUAL "")
-      message(STATUS " NDK: $ENV{SWIFT_ANDROID_NDK_PATH}")
+      message(STATUS " NDK: ${SWIFT_ANDROID_NDK_PATH}")
     endif()
     if(NOT "${SWIFT_ANDROID_NATIVE_SYSROOT}" STREQUAL "")
       message(STATUS " Sysroot: ${SWIFT_ANDROID_NATIVE_SYSROOT}")

utils/swift_build_support/swift_build_support/products/product.py

@@ -212,7 +212,7 @@ def install_toolchain_path(self, host_target):
         if self.args.cross_compile_hosts:
             if self.is_darwin_host(host_target):
                 install_destdir = self.host_install_destdir(host_target)
-            else:
+            elif self.args.cross_compile_append_host_target_to_destdir:
                 install_destdir = os.path.join(install_destdir, self.args.host_target)
         return targets.toolchain_path(install_destdir,
                                       self.args.install_prefix)