Android test runner: Rename "Error" to "ANDROID"

tools/android-run.py

 #!/usr/bin/env python
 #
 # Copyright 2012 the V8 project authors. 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
@@ skipping 24 matching lines @@
 # and output special error string in case of non-zero exit code.
 # Then we parse the output of 'adb shell' and look for that error string.
 
 import os
 from os.path import join, dirname, abspath
 import subprocess
 import sys
 import tempfile
 
 def Check(output, errors):
-  failed = any([s.startswith('/system/bin/sh:') or s.startswith('Error')
+  failed = any([s.startswith('/system/bin/sh:') or s.startswith('ANDROID')
                 for s in output.split('\n')])
   return 1 if failed else 0
 
 def Execute(cmdline):
   (fd_out, outname) = tempfile.mkstemp()
   (fd_err, errname) = tempfile.mkstemp()
   process = subprocess.Popen(
     args=cmdline,
     shell=True,
     stdout=fd_out,
@@ skipping 29 matching lines @@
 
 def Main():
   if (len(sys.argv) == 1):
     print("Usage: %s <command-to-run-on-device>" % sys.argv[0])
     return 1
   workspace = abspath(join(dirname(sys.argv[0]), '..'))
   android_workspace = os.getenv("ANDROID_V8", "/data/local/v8")
   args = [Escape(arg) for arg in sys.argv[1:]]
   script = (" ".join(args) + "\n"
             "case $? in\n"
-            "  0) break;;\n"
-            "  *) echo \"Error returned by test\";;\n"
+            "  0) ;;\n"
+            "  *) echo \"ANDROID: Error returned by test\";;\n"
             "esac\n")
   script = script.replace(workspace, android_workspace)
   script_file = WriteToTemporaryFile(script)
   android_script_file = android_workspace + "/" + script_file
   command =  ("adb push '%s' %s;" % (script_file, android_script_file) +
               "adb shell 'sh %s';" % android_script_file +
               "adb shell 'rm %s'" % android_script_file)
   error_code = Execute(command)
   os.unlink(script_file)
   return error_code
 
 if __name__ == '__main__':
   sys.exit(Main())