[Android] Fix _WatchTestOutput after r207099

build/android/pylib/gtest/test_package.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 
 import logging
 import os
 import re
 
 from pylib import constants
@@ skipping 161 matching lines @@
                 full_test_name, base_test_result.ResultType.FAIL, log=log))
     except pexpect.EOF:
       logging.error('Test terminated - EOF')
       # We're here because either the device went offline, or the test harness
       # crashed without outputting the CRASHED marker (crbug.com/175538).
       if not self.adb.IsOnline():
         raise errors.DeviceUnresponsiveError('Device %s went offline.' %
                                              self.device)
       if full_test_name:
         results.AddResult(base_test_result.BaseTestResult(
-            full_test_name, base_test_result.ResultType.CRASH, log=log))
+            full_test_name, base_test_result.ResultType.CRASH,
+            log=p.before.replace('\r', '')))
     except pexpect.TIMEOUT:
       logging.error('Test terminated after %d second timeout.',
                     self.timeout)
       if full_test_name:
         results.AddResult(base_test_result.BaseTestResult(
-            full_test_name, base_test_result.ResultType.TIMEOUT, log=log))
+            full_test_name, base_test_result.ResultType.TIMEOUT,
+            log=p.before.replace('\r', '')))
     finally:
       p.close()
 
     ret_code = self._GetGTestReturnCode()
     if ret_code:
       logging.critical(
           'gtest exit code: %d\npexpect.before: %s\npexpect.after: %s',
           ret_code, p.before, p.after)
 
     return results