Merge remote-tracking branch 'origin/4.3'

Conflicts:
	tests/auto/debugger/tst_dumpers.cpp

Change-Id: Id8b53b000f94a1b5ab923db79f67bad3276d09dc

src/plugins/android/androidrunner.h

@@ -75,9 +75,6 @@ signals:
     void adbParametersChanged(const QString &packageName, const QStringList &selector);
     void avdDetected();
 
-    void pidFound(qint64, const QString &name);
-    void pidLost(qint64);
-
 private:
     void checkAVD();
     void launchAVD();