Android: Use new setup for more plugin items

Change-Id: Id5ff09813ab7b4be425d007abd4cc04d9c9472c1
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>

src/plugins/android/androidtoolchain.cpp

@@ -18,8 +18,7 @@
 using namespace ProjectExplorer;
 using namespace Utils;
 
-namespace Android {
-namespace Internal {
+namespace Android::Internal {
 
 static Q_LOGGING_CATEGORY(androidTCLog, "qtc.android.toolchainmanagement", QtWarningMsg);
 
@@ -252,5 +251,9 @@ ToolChainList AndroidToolChainFactory::autodetectToolChainsFromNdks(
     return result;
 }
 
-} // namespace Internal
-} // namespace Android
+void setupAndroidToolchain()
+{
+    static AndroidToolChainFactory theAndroidToolchainFactory;
+}
+
+} // Android::Internal