[Android] Fix symlink --output-directory handling in test_runner.py.

build/android/test_runner.py

 #!/usr/bin/env python
 #
 # Copyright 2013 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 all types of tests from one unified interface."""
 
 import argparse
 import collections
@@ skipping 46 matching lines @@
   debug_or_release_group.add_argument(
       '--debug', action='store_const', const='Debug', dest='build_type',
       default=default_build_type,
       help=('If set, run test suites under out/Debug. '
             'Default is env var BUILDTYPE or Debug.'))
   debug_or_release_group.add_argument(
       '--release', action='store_const', const='Release', dest='build_type',
       help=('If set, run test suites under out/Release. '
             'Default is env var BUILDTYPE or Debug.'))
 
+  # TODO(jbudorick): Remove --build-directory once no bots use it.
   group.add_argument('--build-directory', dest='build_directory',
-                     help=('Path to the directory in which build files are'
-                           ' located (should not include build type)'))
+                     help='DEPRECATED')
   group.add_argument('--output-directory', dest='output_directory',
+                     type=os.path.realpath,
                      help=('Path to the directory in which build files are'
                            ' located (must include build type). This will take'
                            ' precedence over --debug, --release and'
                            ' --build-directory'))
   group.add_argument('--num_retries', '--num-retries', dest='num_retries',
                      type=int, default=2,
                      help=('Number of retries for a test before '
                            'giving up (default: %(default)s).'))
   group.add_argument('-v',
                      '--verbose',
@@ skipping 857 matching lines @@
     if e.is_infra_error:
       return constants.INFRA_EXIT_CODE
     return constants.ERROR_EXIT_CODE
   except: # pylint: disable=W0702
     logging.exception('Unrecognized error occurred.')
     return constants.ERROR_EXIT_CODE
 
 
 if __name__ == '__main__':
   sys.exit(main())