Landing patch set 7 from https://codereview.chromium.org/1450113003/

runtime/bin/process_linux.cc

Index: runtime/bin/process_linux.cc
diff --git a/runtime/bin/process_linux.cc b/runtime/bin/process_linux.cc
index cd9c639b9fa6abdb9bee4784a50faa7c8e3996cd..30f188f1299209ae7bac3ca51af82ae68bdcb028 100644
--- a/runtime/bin/process_linux.cc
+++ b/runtime/bin/process_linux.cc
@@ -16,11 +16,12 @@
 #include <sys/wait.h>  // NOLINT
 #include <unistd.h>  // NOLINT
 
-#include "platform/signal_blocker.h"
 #include "bin/fdutils.h"
 #include "bin/lockers.h"
 #include "bin/log.h"
 #include "bin/thread.h"
+#include "platform/signal_blocker.h"
+#include "platform/utils.h"
 
 
 extern char **environ;
@@ -643,7 +644,7 @@ class ProcessStarter {
   void SetChildOsErrorMessage() {
     const int kBufferSize = 1024;
     char error_buf[kBufferSize];
-    *os_error_message_ = strdup(strerror_r(errno, error_buf, kBufferSize));
+    *os_error_message_ = strdup(Utils::StrError(errno, error_buf, kBufferSize));
   }
 
 
@@ -653,7 +654,7 @@ class ProcessStarter {
     int child_errno = errno;
     const int kBufferSize = 1024;
     char error_buf[kBufferSize];
-    char* os_error_message = strerror_r(errno, error_buf, kBufferSize);
+    char* os_error_message = Utils::StrError(errno, error_buf, kBufferSize);
     int bytes_written =
         FDUtils::WriteToBlocking(
             exec_control_[1], &child_errno, sizeof(child_errno));