Merge remote-tracking branch 'origin/4.8'

Conflicts:
	src/plugins/android/androidrunnerworker.cpp

Change-Id: Ibd8b99435365fb7e7d488313fd1d2b3a75adad1b

src/libs/utils/tooltip/tips.cpp

@@ -43,6 +43,8 @@
 #include <QPaintEvent>
 #include <QVBoxLayout>
 
+#include <memory>
+
 namespace Utils {
 namespace Internal {