[Ubuntu] Switch android tools installation to use sdkmanager from command-line tools (#3650)

* Switch android tools installation to cmdline-tools
* Replace deprecated sdkmanger from sdk-tools to the one from cmdline tools
* Remove patcherv4 from toolsets as it's included in m2repository extras

* Add tests to make sure both sdkmanagers exist

* Return cmdline-tools to software readme
* Get-AndroidInstalledPackages function now use list_installed param
* Create a function to get sdkmanager version = cmdline tools version

* Get rid of hardcoded path to ANDROID_HOME
* Add reloadEtcEnvironment call to installation script
* Use env variable ANDROID_HOME in tests

* Modify software report to output any version

* Change regex pattern to output the group
* Currently the function returns 4. instead of 4.0, this change fixes it

images/linux/scripts/tests/Android.Tests.ps1

@@ -32,8 +32,6 @@ Describe "Android" {
     $androidPackages = $androidPackages | ForEach-Object { $_ }
 
     BeforeAll {
-        $ANDROID_SDK_DIR = "/usr/local/lib/android/sdk"
-
         function Validate-AndroidPackage {
             param (
                 [Parameter(Mandatory=$true)]
@@ -45,11 +43,28 @@ Describe "Android" {
             #         'cmake;3.6.4111459' -> 'cmake/3.6.4111459'
             #         'patcher;v4' -> 'patcher/v4'
             $PackageName = $PackageName.Replace(";", "/")
-            $targetPath = Join-Path $ANDROID_SDK_DIR $PackageName
+            $targetPath = Join-Path $env:ANDROID_HOME $PackageName
             $targetPath | Should -Exist
         }
     }
 
+    Context "SDKManagers" {
+        $testCases = @(
+            @{
+                PackageName = "SDK tools"
+                Sdkmanager = "$env:ANDROID_HOME/tools/bin/sdkmanager"
+            },
+            @{
+                PackageName = "Command-line tools"
+                Sdkmanager = "$env:ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager"
+            }
+        )
+
+        It "Sdkmanager from <PackageName> is available" -TestCases $testCases {
+            "$Sdkmanager --version" | Should -ReturnZeroExitCode
+        }
+    }
+
     Context "Packages" {
         $testCases = $androidPackages | ForEach-Object { @{ PackageName = $_ } }