| Index: runtime/bin/file_android.cc
 | 
| diff --git a/runtime/bin/file_android.cc b/runtime/bin/file_android.cc
 | 
| index 35b6388b6e5cdac208f37e8efab7718fb8689e98..cc29740f094e524cddef3672a836566e37de425c 100644
 | 
| --- a/runtime/bin/file_android.cc
 | 
| +++ b/runtime/bin/file_android.cc
 | 
| @@ -19,6 +19,7 @@
 | 
|  #include "bin/log.h"
 | 
|  
 | 
|  #include "platform/signal_blocker.h"
 | 
| +#include "platform/utils.h"
 | 
|  
 | 
|  
 | 
|  namespace dart {
 | 
| @@ -57,7 +58,7 @@ void File::Close() {
 | 
|      if (err != 0) {
 | 
|        const int kBufferSize = 1024;
 | 
|        char error_message[kBufferSize];
 | 
| -      strerror_r(errno, error_message, kBufferSize);
 | 
| +      Utils::StrError(errno, error_message, kBufferSize);
 | 
|        Log::PrintErr("%s\n", error_message);
 | 
|      }
 | 
|    }
 | 
| @@ -422,7 +423,7 @@ File::StdioHandleType File::GetStdioHandleType(int fd) {
 | 
|    if (result == -1) {
 | 
|      const int kBufferSize = 1024;
 | 
|      char error_message[kBufferSize];
 | 
| -    strerror_r(errno, error_message, kBufferSize);
 | 
| +    Utils::StrError(errno, error_message, kBufferSize);
 | 
|      FATAL2("Failed stat on file descriptor %d: %s", fd, error_message);
 | 
|    }
 | 
|    if (S_ISCHR(buf.st_mode)) return kTerminal;
 | 
| 
 |