Upstream changes to python tests.

build/android/run_instrumentation_tests.py

Index: build/android/run_instrumentation_tests.py
diff --git a/build/android/run_instrumentation_tests.py b/build/android/run_instrumentation_tests.py
index 9e9a280383b75cc109ede1f2a5d22e6641b16bda..5a0b171754d15ec2c08e74db0b1e3ab11ec06fe0 100755
--- a/build/android/run_instrumentation_tests.py
+++ b/build/android/run_instrumentation_tests.py
@@ -6,6 +6,7 @@
 
 """Runs both the Python and Java tests."""
 
+import optparse
 import sys
 import time
 
@@ -69,7 +70,11 @@ def DispatchInstrumentationTests(options):
 
 
 def main(argv):
-  options = test_options_parser.ParseInstrumentationArgs(argv)
+  option_parser = optparse.OptionParser()
+  test_options_parser.AddInstrumentationOptions(option_parser)
+  options, args = option_parser.parse_args(argv)
+  test_options_parser.ValidateInstrumentationOptions(options, args)
+
   run_tests_helper.SetLogLevel(options.verbose_count)
   buildbot_report.PrintNamedStep('Instrumentation tests: %s'
                                  % ', '.join(options.annotation))