diff --git a/src/plugins/android/androiddevice.cpp b/src/plugins/android/androiddevice.cpp
index 451d6a549eb..09ec2c837d9 100644
--- a/src/plugins/android/androiddevice.cpp
+++ b/src/plugins/android/androiddevice.cpp
@@ -860,8 +860,8 @@ void AndroidDeviceManager::handleDevicesListChange(const QString &serialNumber)
             newDev->setDeviceState(state);
 
             newDev->setExtraData(Constants::AndroidSerialNumber, serial);
-            newDev->setExtraData(Constants::AndroidCpuAbi, androidConfig().getAbis(serial));
-            newDev->setExtraData(Constants::AndroidSdk, androidConfig().getSDKVersion(serial));
+            newDev->setExtraData(Constants::AndroidCpuAbi, AndroidConfig::getAbis(serial));
+            newDev->setExtraData(Constants::AndroidSdk, AndroidConfig::getSDKVersion(serial));
 
             qCDebug(androidDeviceLog, "Registering new Android device id \"%s\".",
                     newDev->id().toString().toUtf8().data());
diff --git a/src/plugins/android/androidqmlpreviewworker.cpp b/src/plugins/android/androidqmlpreviewworker.cpp
index 2f29f5a70fb..fdf829fc515 100644
--- a/src/plugins/android/androidqmlpreviewworker.cpp
+++ b/src/plugins/android/androidqmlpreviewworker.cpp
@@ -290,7 +290,7 @@ bool AndroidQmlPreviewWorker::ensureAvdIsRunning()
                 appendMessage(Tr::tr("Could not start AVD."), ErrorMessageFormat);
             } else {
                 m_serialNumber = devInfoLocal.serialNumber;
-                m_avdAbis = androidConfig().getAbis(m_serialNumber);
+                m_avdAbis = AndroidConfig::getAbis(m_serialNumber);
             }
             return !devInfoLocal.serialNumber.isEmpty();
         } else {
@@ -298,7 +298,7 @@ bool AndroidQmlPreviewWorker::ensureAvdIsRunning()
         }
         return false;
     }
-    m_avdAbis = androidConfig().getAbis(m_serialNumber);
+    m_avdAbis = AndroidConfig::getAbis(m_serialNumber);
     return true;
 }
 
diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp
index 8f1f40ffe07..376c4e87d0e 100644
--- a/src/plugins/android/androidsettingswidget.cpp
+++ b/src/plugins/android/androidsettingswidget.cpp
@@ -795,7 +795,7 @@ void AndroidSettingsWidget::updateUI()
     const FilePath currentNdk = FilePath::fromUserInput(currentItem ? currentItem->text() : "");
     const QString infoText = Tr::tr("(SDK Version: %1, NDK Version: %2)")
             .arg(androidConfig().sdkToolsVersion().toString())
-            .arg(currentNdk.isEmpty() ? "" : androidConfig().ndkVersion(currentNdk).toString());
+            .arg(currentNdk.isEmpty() ? "" : AndroidConfig::ndkVersion(currentNdk).toString());
     m_androidSummary->setInfoText(androidSetupOk ? infoText : "");
 
     m_androidSummary->setSetupOk(androidSetupOk);
diff --git a/src/plugins/android/androidtoolchain.cpp b/src/plugins/android/androidtoolchain.cpp
index a83a99a4d85..988176ab2f0 100644
--- a/src/plugins/android/androidtoolchain.cpp
+++ b/src/plugins/android/androidtoolchain.cpp
@@ -87,7 +87,7 @@ bool AndroidToolchain::isValid() const
 void AndroidToolchain::addToEnvironment(Environment &env) const
 {
     const AndroidConfig &config = androidConfig();
-    env.set(QLatin1String("ANDROID_NDK_HOST"), config.toolchainHostFromNdk(m_ndkLocation));
+    env.set(QLatin1String("ANDROID_NDK_HOST"), AndroidConfig::toolchainHostFromNdk(m_ndkLocation));
     const FilePath javaHome = config.openJDKLocation();
     if (javaHome.exists()) {
         env.set(Constants::JAVA_HOME_ENV_VAR, javaHome.toUserOutput());
@@ -118,7 +118,7 @@ QStringList AndroidToolchain::suggestedMkspecList() const
 FilePath AndroidToolchain::makeCommand(const Environment &env) const
 {
     Q_UNUSED(env)
-    FilePath makePath = androidConfig().makePathFromNdk(m_ndkLocation);
+    FilePath makePath = AndroidConfig::makePathFromNdk(m_ndkLocation);
     return makePath.exists() ? makePath : FilePath("make");
 }
 
@@ -169,7 +169,7 @@ ToolchainList autodetectToolchainsFromNdks(
     };
 
     for (const FilePath &ndkLocation : ndkLocations) {
-        FilePath clangPath = config.clangPathFromNdk(ndkLocation);
+        const FilePath clangPath = AndroidConfig::clangPathFromNdk(ndkLocation);
         if (!clangPath.exists()) {
             qCDebug(androidTCLog) << "Clang toolchains detection fails. Can not find Clang"
                                   << clangPath;
@@ -193,11 +193,11 @@ ToolchainList autodetectToolchainsFromNdks(
                 const QString target = targetItr.key();
                 Toolchain *tc = findToolchain(compilerCommand, lang, target, alreadyKnown);
 
-                QLatin1String customStr = isCustom ? QLatin1String("Custom ") : QLatin1String();
+                const QString customStr = isCustom ? "Custom " : QString();
                 const QString displayName(customStr + QString("Android Clang (%1, %2, NDK %3)")
-                                              .arg(ToolchainManager::displayNameOfLanguageId(lang),
-                                                   AndroidConfig::displayName(abi),
-                                                   config.ndkVersion(ndkLocation).toString()));
+                                         .arg(ToolchainManager::displayNameOfLanguageId(lang),
+                                              AndroidConfig::displayName(abi),
+                                              AndroidConfig::ndkVersion(ndkLocation).toString()));
                 if (tc) {
                     // make sure to update the toolchain with current name format
                     if (tc->displayName() != displayName)