[Android] Fix backwards compatibility flags with perf tests running in platform mode.

build/android/pylib/perf/perf_test_instance.py

 # Copyright 2016 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.
 
 import json
 import logging
 import os
 import pickle
 import re
 
@@ skipping 46 matching lines @@
 
 
 class PerfTestInstance(test_instance.TestInstance):
   def __init__(self, args, _):
     super(PerfTestInstance, self).__init__()
 
     self._collect_chartjson_data = args.collect_chartjson_data
     self._dry_run = args.dry_run
     self._flaky_steps = args.flaky_steps
     self._output_dir_archive_path = args.output_dir_archive_path
+    # TODO(rnephew): Get rid of this when everything uses
+    # --output-dir-archive-path
+    if self._output_dir_archive_path is None and args.get_output_dir_archive:
+      self._output_dir_archive_path = args.get_output_dir_archive
     self._known_devices_file = args.known_devices_file
     self._max_battery_temp = args.max_battery_temp
     self._min_battery_level = args.min_battery_level
     self._no_timeout = args.no_timeout
     self._output_chartjson_data = args.output_chartjson_data
     self._output_json_list = args.output_json_list
     self._print_step = args.print_step
     self._single_step = (
         ' '.join(args.single_step_command) if args.single_step else None)
     self._steps = args.steps
@@ skipping 151 matching lines @@
 
   @property
   def test_filter(self):
     return self._test_filter
 
 
 class PersistentDataError(base_error.BaseError):
   def __init__(self, message):
     super(PersistentDataError, self).__init__(message)
     self._is_infra_error = True