Azure DevOps ndk in inconsistent location on macOS agent

[dansiegel]

Description

AvdManager Emulator Install test fails on macOS agent due to Warning: Observed package in inconsistent location.

[xUnit.net 00:00:18.59]     Xappium.Cli.Tests.AvdManagerTests.InstallsEmulator [FAIL]
  X Xappium.Cli.Tests.AvdManagerTests.InstallsEmulator [14s 996ms]
  Error Message:
   System.Exception : Warning: Observed package id 'ndk;21.4.7075529' in inconsistent location '/Users/runner/Library/Android/sdk/ndk-bundle' (Expected '/Users/runner/Library/Android/sdk/ndk/21.4.7075529')
Error: Package path is not valid. Valid system image paths are:
null
  Stack Trace:
     at Xappium.Android.AvdManager.ExecuteInternal(Action`1 configure, CancellationToken cancellationToken, PipeSource stdInput) in /_/src/Xappium.Cli/Android/Tools/AvdManager.cs:line 98
   at Xappium.Android.AvdManager.InstallEmulator(Int32 sdkVersion, CancellationToken cancellationToken) in /_/src/Xappium.Cli/Android/Tools/AvdManager.cs:line 32
   at Xappium.Cli.Tests.AvdManagerTests.InstallsEmulator() in /_/tests/Xappium.Cli.Tests/AvdManagerTests.cs:line 28
--- End of stack trace from previous location where exception was thrown ---

macOS Agent Android Home directory has both an ndk & ndk-bundle sub-directory:

--- ndk ---

18.1.5063045
21.4.7075529
22.0.7026061

--- ndk-bundle ---

CHANGELOG.md
NOTICE
NOTICE.toolchain
README.md
build
meta
ndk-build
ndk-gdb
ndk-stack
ndk-which
package.xml
platforms
prebuilt
python-packages
shader-tools
simpleperf
source.properties
sources
sysroot
toolchains
wrap.sh

--- Android Environment Variables ---

ANDROID_HOME=/Users/runner/Library/Android/sdk
ANDROID_SDK_ROOT=/Users/runner/Library/Android/sdk
ANDROID_NDK_ROOT=/Users/runner/Library/Android/sdk/ndk-bundle
ANDROID_NDK_LATEST_HOME=/Users/runner/Library/Android/sdk/ndk/22.0.7026061
ANDROID_NDK_18R_PATH=/Users/runner/Library/Android/sdk/ndk/18.1.5063045
ANDROID_NDK_HOME=/Users/runner/Library/Android/sdk/ndk-bundle

PATH=/usr/local/opt/pipx_bin:/Users/runner/.cargo/bin:/usr/local/lib/ruby/gems/2.7.0/bin:/usr/local/opt/ruby@2.7/bin:/usr/local/opt/curl/bin:/usr/local/bin:/usr/local/sbin:/Users/runner/bin:/Users/runner/.yarn/bin:/Users/runner/Library/Android/sdk/tools:/Users/runner/Library/Android/sdk/platform-tools:/Users/runner/Library/Android/sdk/ndk-bundle:/Library/Frameworks/Mono.framework/Versions/Current/Commands:/usr/bin:/bin:/usr/sbin:/sbin:/Users/runner/.dotnet/tools:/Users/runner/.ghcup/bin:/Users/runner/hostedtoolcache/stack/2.5.1/x64