Merge remote-tracking branch 'origin/2.6'

Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/android/androidrunner.cpp
	src/plugins/projectexplorer/kitmanager.cpp

Change-Id: I653ddaef6e341818fc74aacfe30e89c07f40a8c6

src/plugins/android/androidrunner.h

@@ -55,7 +55,8 @@ public:
 
 public slots:
     void start();
-    void stop();
+    void stop(bool async);
+    void asyncStop();
 
 signals:
     void remoteProcessStarted(int gdbServerPort = -1, int qmlPort = -1);