Revert of Try #3 to fix the android layout tests crash in run-webkit-tests.

Tools/Scripts/webkitpy/layout_tests/port/android.py

 # Copyright (C) 2012 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 239 matching lines @@
     def run(self, command, ignore_error=False):
         self._log_debug('Run adb command: ' + str(command))
         if ignore_error:
             error_handler = self._executive.ignore_error
         else:
             error_handler = None
 
         result = self._executive.run_command(self.adb_command() + command, error_handler=error_handler, debug_logging=self._debug_logging)
 
         # We limit the length to avoid outputting too verbose commands, such as "adb logcat".
-        self._log_debug('Run adb result: ' + result[:80])
+        # Also make sure that the output is ascii-encoded to avoid confusing other parts of
+        # the system.
+        self._log_debug('Run adb result: ' + result[:80].encode('ascii', errors='replace'))
         return result
 
     def get_serial(self):
         return self._device_serial
 
     def adb_command(self):
         return [AndroidCommands.adb_command_path(self._executive, self._debug_logging), '-s', self._device_serial]
 
     @staticmethod
     def set_adb_command_path_options(paths):
@@ skipping 997 matching lines @@
         return command
 
     def _read_prompt(self, deadline):
         last_char = ''
         while True:
             current_char = self._server_process.read_stdout(deadline, 1)
             if current_char == ' ':
                 if last_char in ('#', '$'):
                     return
             last_char = current_char