[android] Instumentation tests determine whether to install test apk based on Md5Sum.

build/android/test_runner.py

Index: build/android/test_runner.py
diff --git a/build/android/test_runner.py b/build/android/test_runner.py
index f89fdb9263bc9008ac61a6e3325e765b8c90bfe5..732266185297a394f4902cd19e92e4acbabeb4d6 100755
--- a/build/android/test_runner.py
+++ b/build/android/test_runner.py
@@ -265,7 +265,7 @@ def AddInstrumentationTestOptions(option_parser):
 
   option_parser.usage = '%prog instrumentation [options]'
   option_parser.command_list = []
-  option_parser.example = ('%prog instrumentation -I '
+  option_parser.example = ('%prog instrumentation '
                            '--test-apk=ChromiumTestShellTest')
 
   AddJavaTestOptions(option_parser)
@@ -274,8 +274,9 @@ def AddInstrumentationTestOptions(option_parser):
   option_parser.add_option('-w', '--wait_debugger', dest='wait_for_debugger',
                            action='store_true',
                            help='Wait for debugger.')
+  #TODO(craigdh): Remove option once -I is no longer passed downstream.
   option_parser.add_option('-I', dest='install_apk', action='store_true',
-                           help='Install test APK.')
+                           help='(DEPRECATED) Install the test apk.')
   option_parser.add_option(
       '--test-apk', dest='test_apk',
       help=('The name of the apk containing the tests '
@@ -428,10 +429,9 @@ def _RunInstrumentationTests(options, error_func):
     runner_factory, tests = instrumentation_setup.Setup(
         options.test_apk_path, options.test_apk_jar_path, options.annotations,
         options.exclude_annotations, options.test_filter, options.build_type,
-        options.test_data, options.install_apk, options.save_perf_json,
-        options.screenshot_failures, options.tool, options.wait_for_debugger,
-        options.disable_assertions, options.push_deps,
-        options.cleanup_test_files)
+        options.test_data, options.save_perf_json, options.screenshot_failures,
+        options.tool, options.wait_for_debugger, options.disable_assertions,
+        options.push_deps, options.cleanup_test_files)
 
     test_results, exit_code = test_dispatcher.RunTests(
         tests, runner_factory, options.wait_for_debugger,