Merge remote-tracking branch 'origin/4.8'

Conflicts:
	src/plugins/cpptools/compileroptionsbuilder.cpp

Change-Id: I743ea39480cc5c7b6febcd2e93713d15a3ae6d9c

src/plugins/android/androidrunnerworker.h

@@ -111,6 +111,7 @@ protected:
     QString m_extraAppParams;
     Utils::Environment m_extraEnvVars;
     QString m_gdbserverPath;
+    bool m_useAppParamsForQmlDebugger = false;
 };
 
 } // namespace Internal