| Index: runtime/bin/process_android.cc | 
| diff --git a/runtime/bin/process_android.cc b/runtime/bin/process_android.cc | 
| index 9265531678c6c13bfaac87b8373f01d897e41a4b..b9d245bbb888e8e0051c7f1c6da252de79d1791c 100644 | 
| --- a/runtime/bin/process_android.cc | 
| +++ b/runtime/bin/process_android.cc | 
| @@ -22,6 +22,7 @@ | 
| #include "bin/thread.h" | 
|  | 
| #include "platform/signal_blocker.h" | 
| +#include "platform/utils.h" | 
|  | 
|  | 
| extern char **environ; | 
| @@ -644,7 +645,7 @@ class ProcessStarter { | 
| void SetChildOsErrorMessage() { | 
| const int kBufferSize = 1024; | 
| char error_message[kBufferSize]; | 
| -    strerror_r(errno, error_message, kBufferSize); | 
| +    Utils::StrError(errno, error_message, kBufferSize); | 
| *os_error_message_ = strdup(error_message); | 
| } | 
|  | 
| @@ -655,7 +656,7 @@ class ProcessStarter { | 
| int child_errno = errno; | 
| const int kBufferSize = 1024; | 
| char os_error_message[kBufferSize]; | 
| -    strerror_r(errno, os_error_message, kBufferSize); | 
| +    Utils::StrError(errno, os_error_message, kBufferSize); | 
| int bytes_written = | 
| FDUtils::WriteToBlocking( | 
| exec_control_[1], &child_errno, sizeof(child_errno)); | 
|  |