Merge remote-tracking branch 'origin/7.0'

Conflicts:
	src/plugins/android/androiddevice.h
	src/plugins/android/androidplugin.cpp
	src/plugins/android/androidplugin.h

Change-Id: I1a68354415283fe4a7450706520a576d2a1775e0

src/libs/utils/launcherinterface.cpp

@@ -140,8 +140,9 @@ void LauncherInterfacePrivate::doStop()
     m_server->close();
     QTC_ASSERT(m_process, return);
     m_socket->shutdown();
-    m_process->waitForFinished(3000);
-    ProcessReaper::reap(m_process);
+    m_process->waitForFinished(-1); // Let the process interface finish so that it finishes
+                                    // reaping any possible processes it has started.
+    delete m_process;
     m_process = nullptr;
 }