diff --git a/images/linux/scripts/installers/1604/android.sh b/images/linux/scripts/installers/1604/android.sh
deleted file mode 100644
index 1d8d2d9ce..000000000
--- a/images/linux/scripts/installers/1604/android.sh
+++ /dev/null
@@ -1,171 +0,0 @@
-#!/bin/bash
-################################################################################
-##  File:  android.sh
-##  Desc:  Installs Android SDK
-################################################################################
-
-set -e
-
-# Source the helpers for use with the script
-source $HELPER_SCRIPTS/document.sh
-
-# Set env variable for SDK Root (https://developer.android.com/studio/command-line/variables)
-    ANDROID_ROOT=/usr/local/lib/android
-    ANDROID_SDK_ROOT=${ANDROID_ROOT}/sdk
-    echo "ANDROID_SDK_ROOT=${ANDROID_SDK_ROOT}" | tee -a /etc/environment
-
-# ANDROID_HOME is deprecated, but older versions of Gradle rely on it
-echo "ANDROID_HOME=${ANDROID_SDK_ROOT}" | tee -a /etc/environment
-
-# Create android sdk directory
-mkdir -p ${ANDROID_SDK_ROOT}
-
-# Download the latest command line tools so that we can accept all of the licenses.
-# See https://developer.android.com/studio/#command-tools
-wget -O android-sdk.zip https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip
-unzip android-sdk.zip -d ${ANDROID_SDK_ROOT}
-rm -f android-sdk.zip
-
-# Check sdk manager installation
-/usr/local/lib/android/sdk/tools/bin/sdkmanager --list 1>/dev/null
-if [ $? -eq 0 ]
-then
-    echo "Android SDK manager was installed"
-else
-    echo "Android SDK manager was not installed"
-    exit 1
-fi
-
-# Add required permissions
-chmod -R a+rwx ${ANDROID_SDK_ROOT}
-
-# Install the following SDKs and build tools, passing in "y" to accept licenses.
-echo "y" | ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager \
-    "ndk-bundle" \
-    "platform-tools" \
-    "platforms;android-30" \
-    "platforms;android-29" \
-    "platforms;android-28" \
-    "platforms;android-27" \
-    "platforms;android-26" \
-    "platforms;android-25" \
-    "platforms;android-24" \
-    "platforms;android-23" \
-    "platforms;android-22" \
-    "platforms;android-21" \
-    "platforms;android-19" \
-    "platforms;android-17" \
-    "platforms;android-15" \
-    "platforms;android-10" \
-    "build-tools;30.0.1" \
-    "build-tools;30.0.0" \
-    "build-tools;29.0.3" \
-    "build-tools;29.0.2" \
-    "build-tools;29.0.0" \
-    "build-tools;28.0.3" \
-    "build-tools;28.0.2" \
-    "build-tools;28.0.1" \
-    "build-tools;28.0.0" \
-    "build-tools;27.0.3" \
-    "build-tools;27.0.2" \
-    "build-tools;27.0.1" \
-    "build-tools;27.0.0" \
-    "build-tools;26.0.3" \
-    "build-tools;26.0.2" \
-    "build-tools;26.0.1" \
-    "build-tools;26.0.0" \
-    "build-tools;25.0.3" \
-    "build-tools;25.0.2" \
-    "build-tools;25.0.1" \
-    "build-tools;25.0.0" \
-    "build-tools;24.0.3" \
-    "build-tools;24.0.2" \
-    "build-tools;24.0.1" \
-    "build-tools;24.0.0" \
-    "build-tools;23.0.3" \
-    "build-tools;23.0.2" \
-    "build-tools;23.0.1" \
-    "build-tools;22.0.1" \
-    "build-tools;21.1.2" \
-    "build-tools;20.0.0" \
-    "build-tools;19.1.0" \
-    "build-tools;17.0.0" \
-    "extras;android;m2repository" \
-    "extras;google;m2repository" \
-    "extras;google;google_play_services" \
-    "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2" \
-    "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.1" \
-    "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2" \
-    "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1" \
-    "add-ons;addon-google_apis-google-24" \
-    "add-ons;addon-google_apis-google-23" \
-    "add-ons;addon-google_apis-google-22" \
-    "add-ons;addon-google_apis-google-21" \
-    "cmake;3.6.4111459" \
-    "cmake;3.10.2.4988404" \
-    "patcher;v4"
-
-# Document what was added to the image
-echo "Lastly, document what was added to the metadata file"
-DocumentInstalledItem "Google Repository $(cat ${ANDROID_SDK_ROOT}/extras/google/m2repository/source.properties 2>&1 | grep Pkg.Revision | cut -d '=' -f 2)"
-DocumentInstalledItem "Google Play services $(cat ${ANDROID_SDK_ROOT}/extras/google/google_play_services/source.properties 2>&1 | grep Pkg.Revision | cut -d '=' -f 2)"
-DocumentInstalledItem "Google APIs 24"
-DocumentInstalledItem "Google APIs 23"
-DocumentInstalledItem "Google APIs 22"
-DocumentInstalledItem "Google APIs 21"
-DocumentInstalledItem "CMake $(ls ${ANDROID_SDK_ROOT}/cmake 2>&1)"
-DocumentInstalledItem "Android Support Repository 47.0.0"
-DocumentInstalledItem "Android Solver for ConstraintLayout 1.0.2"
-DocumentInstalledItem "Android Solver for ConstraintLayout 1.0.1"
-DocumentInstalledItem "Android SDK Platform-Tools $(cat ${ANDROID_SDK_ROOT}/platform-tools/source.properties 2>&1 | grep Pkg.Revision | cut -d '=' -f 2)"
-DocumentInstalledItem "Android SDK Platform 30"
-DocumentInstalledItem "Android SDK Platform 29"
-DocumentInstalledItem "Android SDK Platform 28"
-DocumentInstalledItem "Android SDK Platform 27"
-DocumentInstalledItem "Android SDK Platform 26"
-DocumentInstalledItem "Android SDK Platform 25"
-DocumentInstalledItem "Android SDK Platform 24"
-DocumentInstalledItem "Android SDK Platform 23"
-DocumentInstalledItem "Android SDK Platform 22"
-DocumentInstalledItem "Android SDK Platform 21"
-DocumentInstalledItem "Android SDK Platform 19"
-DocumentInstalledItem "Android SDK Platform 17"
-DocumentInstalledItem "Android SDK Platform 15"
-DocumentInstalledItem "Android SDK Platform 10"
-DocumentInstalledItem "Android SDK Patch Applier v4"
-DocumentInstalledItem "Android SDK Build-Tools 30.0.1"
-DocumentInstalledItem "Android SDK Build-Tools 30.0.0"
-DocumentInstalledItem "Android SDK Build-Tools 29.0.3"
-DocumentInstalledItem "Android SDK Build-Tools 29.0.2"
-DocumentInstalledItem "Android SDK Build-Tools 29.0.0"
-DocumentInstalledItem "Android SDK Build-Tools 28.0.3"
-DocumentInstalledItem "Android SDK Build-Tools 28.0.2"
-DocumentInstalledItem "Android SDK Build-Tools 28.0.1"
-DocumentInstalledItem "Android SDK Build-Tools 28.0.0"
-DocumentInstalledItem "Android SDK Build-Tools 27.0.3"
-DocumentInstalledItem "Android SDK Build-Tools 27.0.2"
-DocumentInstalledItem "Android SDK Build-Tools 27.0.1"
-DocumentInstalledItem "Android SDK Build-Tools 27.0.0"
-DocumentInstalledItem "Android SDK Build-Tools 26.0.3"
-DocumentInstalledItem "Android SDK Build-Tools 26.0.2"
-DocumentInstalledItem "Android SDK Build-Tools 26.0.1"
-DocumentInstalledItem "Android SDK Build-Tools 26.0.0"
-DocumentInstalledItem "Android SDK Build-Tools 25.0.3"
-DocumentInstalledItem "Android SDK Build-Tools 25.0.2"
-DocumentInstalledItem "Android SDK Build-Tools 25.0.1"
-DocumentInstalledItem "Android SDK Build-Tools 25.0.0"
-DocumentInstalledItem "Android SDK Build-Tools 24.0.3"
-DocumentInstalledItem "Android SDK Build-Tools 24.0.2"
-DocumentInstalledItem "Android SDK Build-Tools 24.0.1"
-DocumentInstalledItem "Android SDK Build-Tools 24.0.0"
-DocumentInstalledItem "Android SDK Build-Tools 23.0.3"
-DocumentInstalledItem "Android SDK Build-Tools 23.0.2"
-DocumentInstalledItem "Android SDK Build-Tools 23.0.1"
-DocumentInstalledItem "Android SDK Build-Tools 22.0.1"
-DocumentInstalledItem "Android SDK Build-Tools 21.1.2"
-DocumentInstalledItem "Android SDK Build-Tools 20.0.0"
-DocumentInstalledItem "Android SDK Build-Tools 19.1.0"
-DocumentInstalledItem "Android SDK Build-Tools 17.0.0"
-DocumentInstalledItem "Android NDK $(cat ${ANDROID_SDK_ROOT}/ndk-bundle/source.properties 2>&1 | grep Pkg.Revision | cut -d ' ' -f 3)"
-DocumentInstalledItem "Android ConstraintLayout 1.0.2"
-DocumentInstalledItem "Android ConstraintLayout 1.0.1"
diff --git a/images/linux/scripts/installers/1804/android.sh b/images/linux/scripts/installers/1804/android.sh
deleted file mode 100644
index eddecb35b..000000000
--- a/images/linux/scripts/installers/1804/android.sh
+++ /dev/null
@@ -1,159 +0,0 @@
-#!/bin/bash
-################################################################################
-##  File:  android.sh
-##  Desc:  Installs Android SDK
-################################################################################
-
-set -e
-
-# Source the helpers for use with the script
-source $HELPER_SCRIPTS/document.sh
-
-# Set env variable for SDK Root (https://developer.android.com/studio/command-line/variables)
-ANDROID_ROOT=/usr/local/lib/android
-ANDROID_SDK_ROOT=${ANDROID_ROOT}/sdk
-echo "ANDROID_SDK_ROOT=${ANDROID_SDK_ROOT}" | tee -a /etc/environment
-
-# ANDROID_HOME is deprecated, but older versions of Gradle rely on it
-echo "ANDROID_HOME=${ANDROID_SDK_ROOT}" | tee -a /etc/environment
-
-# Create android sdk directory
-mkdir -p ${ANDROID_SDK_ROOT}
-
-# Download the latest command line tools so that we can accept all of the licenses.
-# See https://developer.android.com/studio/#command-tools
-wget -O android-sdk.zip https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip
-unzip android-sdk.zip -d ${ANDROID_SDK_ROOT}
-rm -f android-sdk.zip
-
-# Add required permissions
-chmod -R a+rwx ${ANDROID_SDK_ROOT}
-
-# Check sdk manager installation
-/usr/local/lib/android/sdk/tools/bin/sdkmanager --list 1>/dev/null
-if [ $? -eq 0 ]
-then
-    echo "Android SDK manager was installed"
-else
-    echo "Android SDK manager was not installed"
-    exit 1
-fi
-
-# Install the following SDKs and build tools, passing in "y" to accept licenses.
-echo "y" | ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager \
-    "ndk-bundle" \
-    "platform-tools" \
-    "platforms;android-30" \
-    "platforms;android-29" \
-    "platforms;android-28" \
-    "platforms;android-27" \
-    "platforms;android-26" \
-    "platforms;android-25" \
-    "platforms;android-24" \
-    "platforms;android-23" \
-    "platforms;android-22" \
-    "platforms;android-21" \
-    "platforms;android-19" \
-    "platforms;android-17" \
-    "build-tools;30.0.1" \
-    "build-tools;30.0.0" \
-    "build-tools;29.0.3" \
-    "build-tools;29.0.2" \
-    "build-tools;29.0.0" \
-    "build-tools;28.0.3" \
-    "build-tools;28.0.2" \
-    "build-tools;28.0.1" \
-    "build-tools;28.0.0" \
-    "build-tools;27.0.3" \
-    "build-tools;27.0.2" \
-    "build-tools;27.0.1" \
-    "build-tools;27.0.0" \
-    "build-tools;26.0.3" \
-    "build-tools;26.0.2" \
-    "build-tools;26.0.1" \
-    "build-tools;26.0.0" \
-    "build-tools;25.0.3" \
-    "build-tools;25.0.2" \
-    "build-tools;25.0.1" \
-    "build-tools;25.0.0" \
-    "build-tools;24.0.3" \
-    "build-tools;24.0.2" \
-    "build-tools;24.0.1" \
-    "build-tools;24.0.0" \
-    "build-tools;23.0.3" \
-    "build-tools;23.0.2" \
-    "build-tools;23.0.1" \
-    "build-tools;22.0.1" \
-    "build-tools;21.1.2" \
-    "build-tools;20.0.0" \
-    "build-tools;19.1.0" \
-    "build-tools;17.0.0" \
-    "extras;android;m2repository" \
-    "extras;google;m2repository" \
-    "extras;google;google_play_services" \
-    "add-ons;addon-google_apis-google-24" \
-    "add-ons;addon-google_apis-google-23" \
-    "add-ons;addon-google_apis-google-22" \
-    "add-ons;addon-google_apis-google-21" \
-    "cmake;3.6.4111459" \
-    "cmake;3.10.2.4988404" \
-    "patcher;v4"
-
-# Document what was added to the image
-echo "Lastly, document what was added to the metadata file"
-DocumentInstalledItem "Google Repository $(cat ${ANDROID_SDK_ROOT}/extras/google/m2repository/source.properties 2>&1 | grep Pkg.Revision | cut -d '=' -f 2)"
-DocumentInstalledItem "Google Play services $(cat ${ANDROID_SDK_ROOT}/extras/google/google_play_services/source.properties 2>&1 | grep Pkg.Revision | cut -d '=' -f 2)"
-DocumentInstalledItem "Google APIs 24"
-DocumentInstalledItem "Google APIs 23"
-DocumentInstalledItem "Google APIs 22"
-DocumentInstalledItem "Google APIs 21"
-DocumentInstalledItem "CMake $(ls ${ANDROID_SDK_ROOT}/cmake 2>&1)"
-DocumentInstalledItem "Android Support Repository 47.0.0"
-DocumentInstalledItem "Android SDK Platform-Tools $(cat ${ANDROID_SDK_ROOT}/platform-tools/source.properties 2>&1 | grep Pkg.Revision | cut -d '=' -f 2)"
-DocumentInstalledItem "Android SDK Platform 30"
-DocumentInstalledItem "Android SDK Platform 29"
-DocumentInstalledItem "Android SDK Platform 28"
-DocumentInstalledItem "Android SDK Platform 27"
-DocumentInstalledItem "Android SDK Platform 26"
-DocumentInstalledItem "Android SDK Platform 25"
-DocumentInstalledItem "Android SDK Platform 24"
-DocumentInstalledItem "Android SDK Platform 23"
-DocumentInstalledItem "Android SDK Platform 22"
-DocumentInstalledItem "Android SDK Platform 21"
-DocumentInstalledItem "Android SDK Platform 19"
-DocumentInstalledItem "Android SDK Platform 17"
-DocumentInstalledItem "Android SDK Patch Applier v4"
-DocumentInstalledItem "Android SDK Build-Tools 30.0.1"
-DocumentInstalledItem "Android SDK Build-Tools 30.0.0"
-DocumentInstalledItem "Android SDK Build-Tools 29.0.3"
-DocumentInstalledItem "Android SDK Build-Tools 29.0.2"
-DocumentInstalledItem "Android SDK Build-Tools 29.0.0"
-DocumentInstalledItem "Android SDK Build-Tools 28.0.3"
-DocumentInstalledItem "Android SDK Build-Tools 28.0.2"
-DocumentInstalledItem "Android SDK Build-Tools 28.0.1"
-DocumentInstalledItem "Android SDK Build-Tools 28.0.0"
-DocumentInstalledItem "Android SDK Build-Tools 27.0.3"
-DocumentInstalledItem "Android SDK Build-Tools 27.0.2"
-DocumentInstalledItem "Android SDK Build-Tools 27.0.1"
-DocumentInstalledItem "Android SDK Build-Tools 27.0.0"
-DocumentInstalledItem "Android SDK Build-Tools 26.0.3"
-DocumentInstalledItem "Android SDK Build-Tools 26.0.2"
-DocumentInstalledItem "Android SDK Build-Tools 26.0.1"
-DocumentInstalledItem "Android SDK Build-Tools 26.0.0"
-DocumentInstalledItem "Android SDK Build-Tools 25.0.3"
-DocumentInstalledItem "Android SDK Build-Tools 25.0.2"
-DocumentInstalledItem "Android SDK Build-Tools 25.0.1"
-DocumentInstalledItem "Android SDK Build-Tools 25.0.0"
-DocumentInstalledItem "Android SDK Build-Tools 24.0.3"
-DocumentInstalledItem "Android SDK Build-Tools 24.0.2"
-DocumentInstalledItem "Android SDK Build-Tools 24.0.1"
-DocumentInstalledItem "Android SDK Build-Tools 24.0.0"
-DocumentInstalledItem "Android SDK Build-Tools 23.0.3"
-DocumentInstalledItem "Android SDK Build-Tools 23.0.2"
-DocumentInstalledItem "Android SDK Build-Tools 23.0.1"
-DocumentInstalledItem "Android SDK Build-Tools 22.0.1"
-DocumentInstalledItem "Android SDK Build-Tools 21.1.2"
-DocumentInstalledItem "Android SDK Build-Tools 20.0.0"
-DocumentInstalledItem "Android SDK Build-Tools 19.1.0"
-DocumentInstalledItem "Android SDK Build-Tools 17.0.0"
-DocumentInstalledItem "Android NDK $(cat ${ANDROID_SDK_ROOT}/ndk-bundle/source.properties 2>&1 | grep Pkg.Revision | cut -d ' ' -f 3)"
diff --git a/images/linux/scripts/installers/2004/android.sh b/images/linux/scripts/installers/android.sh
similarity index 59%
rename from images/linux/scripts/installers/2004/android.sh
rename to images/linux/scripts/installers/android.sh
index bcae94027..725bf3d33 100644
--- a/images/linux/scripts/installers/2004/android.sh
+++ b/images/linux/scripts/installers/android.sh
@@ -45,56 +45,51 @@ else
     exit 1
 fi
 
+toolsetJson="$INSTALLER_SCRIPT_FOLDER/toolset.json"
+platforms=$(cat $toolsetJson  | jq -r '.android.platform_list[]|"platforms;" + .')
+buildtools=$(cat $toolsetJson  | jq -r '.android.build_tools[]|"build-tools;" + .')
+extras=$(cat $toolsetJson  | jq -r '.android.extra_list[]|"extras;" + .')
+addons=$(cat $toolsetJson  | jq -r '.android.addon_list[]|"add-ons;" + .')
+additional=$(cat $toolsetJson  | jq -r '.android.additional_tools[]')
+
 # Install the following SDKs and build tools, passing in "y" to accept licenses.
-echo "y" | ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager \
-    "ndk-bundle" \
-    "platform-tools" \
-    "platforms;android-30" \
-    "platforms;android-29" \
-    "platforms;android-28" \
-    "platforms;android-27" \
-    "build-tools;30.0.1" \
-    "build-tools;30.0.0" \
-    "build-tools;29.0.3" \
-    "build-tools;29.0.2" \
-    "build-tools;29.0.0" \
-    "build-tools;28.0.3" \
-    "build-tools;28.0.2" \
-    "build-tools;28.0.1" \
-    "build-tools;28.0.0" \
-    "build-tools;27.0.3" \
-    "build-tools;27.0.2" \
-    "build-tools;27.0.1" \
-    "build-tools;27.0.0" \
-    "extras;android;m2repository" \
-    "extras;google;m2repository" \
-    "extras;google;google_play_services" \
-    "cmake;3.10.2.4988404" \
-    "patcher;v4"
+echo "y" | ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager $platforms $buildtools $extras $google_api_list $addons $additional
 
 # Document what was added to the image
+
+google_api_versions_list=$(echo "$addons"|awk -F- '/addon-google_apis-google/  {print $5}')
+constraint_layout_versions_list=$(echo "$extras"|awk -F';' '/constraint-layout;/  {print $8}')
+constraint_layout_solver_versions_list=$(echo "$extras"|awk -F';' '/constraint-layout-solver;/  {print $8}')
+platform_versions_list=$(echo "$platforms"|awk -F- '{print $2}')
+buildtools_versions_list=$(echo "$buildtools"|awk -F';' '{print $2}')
+
 echo "Lastly, document what was added to the metadata file"
 DocumentInstalledItem "Google Repository $(cat ${ANDROID_SDK_ROOT}/extras/google/m2repository/source.properties 2>&1 | grep Pkg.Revision | cut -d '=' -f 2)"
 DocumentInstalledItem "Google Play services $(cat ${ANDROID_SDK_ROOT}/extras/google/google_play_services/source.properties 2>&1 | grep Pkg.Revision | cut -d '=' -f 2)"
+
+for version in $google_api_versions_list; do
+  DocumentInstalledItem "Google APIs $version"
+done
+
 DocumentInstalledItem "CMake $(ls ${ANDROID_SDK_ROOT}/cmake 2>&1)"
-DocumentInstalledItem "Android Support Repository 47.0.0"
+
+for version in $constraint_layout_versions_list; do
+  DocumentInstalledItem "Android ConstraintLayout $version"
+done
+
+for version in $constraint_layout_solver_versions_list; do
+  DocumentInstalledItem "Android ConstraintLayout Solver $version"
+done
+
 DocumentInstalledItem "Android SDK Platform-Tools $(cat ${ANDROID_SDK_ROOT}/platform-tools/source.properties 2>&1 | grep Pkg.Revision | cut -d '=' -f 2)"
-DocumentInstalledItem "Android SDK Platform 30"
-DocumentInstalledItem "Android SDK Platform 29"
-DocumentInstalledItem "Android SDK Platform 28"
-DocumentInstalledItem "Android SDK Platform 27"
+for version in $platform_versions_list; do
+  DocumentInstalledItem "Android SDK Platform $version"
+done
+
 DocumentInstalledItem "Android SDK Patch Applier v4"
-DocumentInstalledItem "Android SDK Build-Tools 30.0.1"
-DocumentInstalledItem "Android SDK Build-Tools 30.0.0"
-DocumentInstalledItem "Android SDK Build-Tools 29.0.3"
-DocumentInstalledItem "Android SDK Build-Tools 29.0.2"
-DocumentInstalledItem "Android SDK Build-Tools 29.0.0"
-DocumentInstalledItem "Android SDK Build-Tools 28.0.3"
-DocumentInstalledItem "Android SDK Build-Tools 28.0.2"
-DocumentInstalledItem "Android SDK Build-Tools 28.0.1"
-DocumentInstalledItem "Android SDK Build-Tools 28.0.0"
-DocumentInstalledItem "Android SDK Build-Tools 27.0.3"
-DocumentInstalledItem "Android SDK Build-Tools 27.0.2"
-DocumentInstalledItem "Android SDK Build-Tools 27.0.1"
-DocumentInstalledItem "Android SDK Build-Tools 27.0.0"
+
+for version in $buildtools_versions_list; do
+  DocumentInstalledItem "Android SDK Build-Tools $version"
+done
+
 DocumentInstalledItem "Android NDK $(cat ${ANDROID_SDK_ROOT}/ndk-bundle/source.properties 2>&1 | grep Pkg.Revision | cut -d ' ' -f 3)"
diff --git a/images/linux/toolsets/toolset-1604.json b/images/linux/toolsets/toolset-1604.json
index dae39f5ec..34093c36d 100644
--- a/images/linux/toolsets/toolset-1604.json
+++ b/images/linux/toolsets/toolset-1604.json
@@ -61,6 +61,36 @@
             ]
         }
     ],
+    "android": {
+        "platform_list": [
+            "android-30", "android-29", "android-28", "android-27", "android-26", "android-25", "android-24", "android-23", "android-22", "android-21", "android-19","android-17","android-15","android-10"
+        ],
+        "build_tools": [
+            "30.0.1", "30.0.0", "29.0.3", "29.0.2", "29.0.1", "29.0.0", "28.0.3", "28.0.2", "28.0.1", "27.0.3", "27.0.2", "27.0.1", "27.0.0", "26.0.3", "26.0.3", "26.0.2", "26.0.1", "26.0.0", "25.0.3", "25.0.2", "25.0.1", "25.0.0", "24.0.3", "24.0.2", "24.0.1", "24.0.0", "23.0.3", "23.0.2", "23.0.1", "22.0.1", "21.1.2", "20.0.0", "19.1.0", "17.0.0"
+        ],
+        "extra_list": [
+            "android;m2repository",
+            "google;m2repository",
+            "google;google_play_services",
+            "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2",
+            "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.1",
+            "m2repository;com;android;support;constraint;constraint-layout;1.0.2",
+            "m2repository;com;android;support;constraint;constraint-layout;1.0.1"
+        ],
+        "addon_list": [
+            "addon-google_apis-google-24",
+            "addon-google_apis-google-23",
+            "addon-google_apis-google-22",
+            "addon-google_apis-google-21"
+        ],
+        "additional_tools": [
+            "cmake;3.6.4111459",
+            "cmake;3.10.2.4988404",
+            "patcher;v4",
+            "ndk-bundle",
+            "platform-tools"
+        ]
+    },
     "azureModules": [
         {
             "name": "az",
diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json
index edf3e9fec..75476413e 100644
--- a/images/linux/toolsets/toolset-1804.json
+++ b/images/linux/toolsets/toolset-1804.json
@@ -61,6 +61,32 @@
             ]
         }
     ],
+    "android": {
+        "platform_list": [
+            "android-30", "android-29", "android-28", "android-27", "android-26", "android-25", "android-24", "android-23", "android-22", "android-21", "android-19","android-17"
+        ],
+        "build_tools": [
+            "30.0.1", "30.0.0", "29.0.3", "29.0.2", "29.0.1", "29.0.0", "28.0.3", "28.0.2", "28.0.1", "27.0.3", "27.0.2", "27.0.1", "27.0.0", "26.0.3", "26.0.3", "26.0.2", "26.0.1", "26.0.0", "25.0.3", "25.0.2", "25.0.1", "25.0.0", "24.0.3", "24.0.2", "24.0.1", "24.0.0", "23.0.3", "23.0.2", "23.0.1", "22.0.1", "21.1.2", "20.0.0", "19.1.0", "17.0.0"
+        ],
+        "extra_list": [
+            "android;m2repository",
+            "google;m2repository",
+            "google;google_play_services"
+        ],
+        "addon_list": [
+            "addon-google_apis-google-24",
+            "addon-google_apis-google-23",
+            "addon-google_apis-google-22",
+            "addon-google_apis-google-21"
+        ],
+        "additional_tools": [
+            "cmake;3.6.4111459",
+            "cmake;3.10.2.4988404",
+            "patcher;v4",
+            "ndk-bundle",
+            "platform-tools"
+        ]
+    },
     "azureModules": [
         {
             "name": "az",
diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json
index 414e89412..e6efc1f15 100644
--- a/images/linux/toolsets/toolset-2004.json
+++ b/images/linux/toolsets/toolset-2004.json
@@ -46,5 +46,26 @@
             ],
             "default": "1.14.*"
         }
-    ]
+    ],
+    "android": {
+        "platform_list": [
+            "android-30", "android-29", "android-28", "android-27"
+        ],
+        "build_tools": [
+            "30.0.1", "30.0.0", "29.0.3", "29.0.2", "29.0.1", "29.0.0", "28.0.3", "28.0.2", "28.0.1", "27.0.3", "27.0.2", "27.0.1", "27.0.0"
+        ],
+        "extra_list": [
+            "android;m2repository",
+            "google;m2repository",
+            "google;google_play_services"
+        ],
+        "addon_list": [
+        ],
+        "additional_tools": [
+            "cmake;3.10.2.4988404",
+            "patcher;v4",
+            "ndk-bundle",
+            "platform-tools"
+        ]
+    }
 }
diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json
index cf7aef1ab..74bc62136 100644
--- a/images/linux/ubuntu1604.json
+++ b/images/linux/ubuntu1604.json
@@ -223,7 +223,7 @@
         {
             "type": "shell",
             "scripts":[
-                "{{template_dir}}/scripts/installers/1604/android.sh",
+                "{{template_dir}}/scripts/installers/android.sh",
                 "{{template_dir}}/scripts/installers/azpowershell.sh",
                 "{{template_dir}}/scripts/helpers/containercache.sh",
                 "{{template_dir}}/scripts/installers/hosted-tool-cache.sh",
diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json
index 956e67739..c5545cc12 100644
--- a/images/linux/ubuntu1804.json
+++ b/images/linux/ubuntu1804.json
@@ -227,7 +227,7 @@
         {
             "type": "shell",
             "scripts":[
-                "{{template_dir}}/scripts/installers/1804/android.sh",
+                "{{template_dir}}/scripts/installers/android.sh",
                 "{{template_dir}}/scripts/installers/azpowershell.sh",
                 "{{template_dir}}/scripts/helpers/containercache.sh",
                 "{{template_dir}}/scripts/installers/hosted-tool-cache.sh",
diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json
index 8a1d2d615..dd91fb7bc 100644
--- a/images/linux/ubuntu2004.json
+++ b/images/linux/ubuntu2004.json
@@ -229,7 +229,7 @@
         {
             "type": "shell",
             "scripts":[
-                "{{template_dir}}/scripts/installers/2004/android.sh",
+                "{{template_dir}}/scripts/installers/android.sh",
                 "{{template_dir}}/scripts/installers/azpowershell.sh",
                 "{{template_dir}}/scripts/helpers/containercache.sh",
                 "{{template_dir}}/scripts/installers/hosted-tool-cache.sh",