Fix ValidateInstrumentationOptions.

build/android/run_instrumentation_tests.py

 #!/usr/bin/env python
 #
 # 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.
 
 """Runs both the Python and Java tests."""
 
 import optparse
 import sys
@@ skipping 55 matching lines @@
 
   all_results, summary_string, num_failing = SummarizeResults(
       java_results, python_results, options.annotation, options.build_type)
   return num_failing
 
 
 def main(argv):
   option_parser = optparse.OptionParser()
   test_options_parser.AddInstrumentationOptions(option_parser)
   options, args = option_parser.parse_args(argv)
-  test_options_parser.ValidateInstrumentationOptions(options, args)
+  test_options_parser.ValidateInstrumentationOptions(option_parser, options,
+                                                     args)
 
   run_tests_helper.SetLogLevel(options.verbose_count)
   buildbot_report.PrintNamedStep('Instrumentation tests: %s'
                                  % ', '.join(options.annotation))
   return DispatchInstrumentationTests(options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))