Merge remote-tracking branch 'origin/4.2'

Conflicts:
	src/plugins/android/androidbuildapkstep.cpp
	src/plugins/genericprojectmanager/genericproject.cpp

Change-Id: I3484b668f9323ed0c05de99f8dfed07c9e65ab98

src/libs/utils/process_stub_unix.c

@@ -309,7 +309,9 @@ int main(int argc, char *argv[])
             execvp(argv[ArgExe], argv + ArgExe);
             /* Only expected error: no such file or direcotry, i.e. executable not found */
             errNo = errno;
-            write(chldPipe[1], &errNo, sizeof(errNo)); /* Only realistic error case is SIGPIPE */
+            /* Only realistic error case is SIGPIPE */
+            if (write(chldPipe[1], &errNo, sizeof(errNo)) != sizeof(errNo))
+                perror("Error passing errno to child");
             _exit(0);
         default:
             for (;;) {