[Android] fix NDK extract location

The Android NDK is being extracted with an extra intermediate directory:

  $BinaryCache\android-ndk-r26b\android-ndk-r26b

The Android build fails because it expects the NDK contents to live
immediately under the directory:

  $BinaryCache\android-ndk-r26b

The extra android-ndk-r26b sub-dir comes from the NDK zip archive
itself, which we have no control over. To work-around, allow callers
of Extract-ZipFile to control whether or not it should create the
extraction sub-dir. Override the default behavior for NDK extraction
only.

Author: andrurogerz

utils/build.ps1

@@ -629,11 +629,13 @@ function Fetch-Dependencies {
     (
         [string]$ZipFileName,
         [string]$BinaryCache,
-        [string]$ExtractPath
+        [string]$ExtractPath,
+        [bool]$CreateExtractPath = $true
     )
 
     $source = Join-Path -Path $BinaryCache -ChildPath $ZipFileName
     $destination = Join-Path -Path $BinaryCache -ChildPath $ExtractPath
+    $extractRoot = if ($CreateExtractPath) { $destination } else { $BinaryCache }
 
     # Check if the extracted directory already exists and is up to date.
     if (Test-Path $destination) {
@@ -648,9 +650,10 @@ function Fetch-Dependencies {
 
     Write-Output "Extracting '$ZipFileName' ..."
     New-Item -ItemType Directory -ErrorAction Ignore -Path $BinaryCache | Out-Null
-    Expand-Archive -Path $source -DestinationPath $destination -Force
+    Expand-Archive -Path $source -DestinationPath $extractRoot -Force
   }
 
+
   function Extract-Toolchain {
     param
     (
@@ -727,7 +730,7 @@ function Fetch-Dependencies {
     $NDKHash = "A478D43D4A45D0D345CDA6BE50D79642B92FB175868D9DC0DFC86181D80F691E"
     DownloadAndVerify $NDKURL "$BinaryCache\android-ndk-$AndroidNDKVersion-windows.zip" $NDKHash
 
-    Extract-ZipFile -ZipFileName "android-ndk-$AndroidNDKVersion-windows.zip" -BinaryCache $BinaryCache -ExtractPath "android-ndk-$AndroidNDKVersion"
+    Extract-ZipFile -ZipFileName "android-ndk-$AndroidNDKVersion-windows.zip" -BinaryCache $BinaryCache -ExtractPath "android-ndk-$AndroidNDKVersion" -CreateExtractPath $false
   }
 
   if ($WinSDKVersion) {