Android gtest runner: Create only a single ApkHelper

build/android/pylib/local/device/local_device_gtest_run.py

 # Copyright 2014 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 itertools
 import os
 import posixpath
 
 from devil.android import device_errors
 from devil.android import device_temp_file
@@ skipping 37 matching lines @@
     host_file_base, ext = os.path.splitext(host_file)
     for i in itertools.count():
       host_file = '%s_%d%s' % (host_file_base, i, ext)
       if not os.path.exists(host_file):
         break
     device.PullFile(device_file, host_file)
 
 class _ApkDelegate(object):
   def __init__(self, test_instance):
     self._activity = test_instance.activity
-    self._apk = test_instance.apk
+    self._apk_helper = test_instance.apk_helper
     self._package = test_instance.package
     self._runner = test_instance.runner
     self._permissions = test_instance.permissions
 
     self._component = '%s/%s' % (self._package, self._runner)
     self._extras = test_instance.extras
 
   def Install(self, device):
-    device.Install(self._apk, permissions=self._permissions)
+    device.Install(self._apk_helper, permissions=self._permissions)
 
   def Run(self, test, device, flags=None, **kwargs):
     extras = dict(self._extras)
 
     if ('timeout' in kwargs
         and gtest_test_instance.EXTRA_SHARD_NANO_TIMEOUT not in extras):
       # Make sure the instrumentation doesn't kill the test before the
       # scripts do. The provided timeout value is in seconds, but the
       # instrumentation deals with nanoseconds because that's how Android
       # handles time.
@@ skipping 175 matching lines @@
     return results
 
   #override
   def TearDown(self):
     @local_device_test_run.handle_shard_failures
     def individual_device_tear_down(dev):
       for s in self._servers.get(str(dev), []):
         s.TearDown()
 
     self._env.parallel_devices.pMap(individual_device_tear_down)