Update from https://crrev.com/308331

build/android/pylib/gtest/gtest_test_instance.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 logging
 import os
 import shutil
 import sys
 
 from pylib import constants
@@ skipping 24 matching lines @@
     # crbug.com/258690
     'webkit/data/bmp_decoder',
     'webkit/data/ico_decoder',
 ]
 
 
 class GtestTestInstance(test_instance.TestInstance):
 
   def __init__(self, options, isolate_delegate):
     super(GtestTestInstance, self).__init__()
+    # TODO(jbudorick): Support multiple test suites.
+    if len(options.suite_name) > 1:
+      raise ValueError('Platform mode currently supports only 1 gtest suite')
     self._apk_path = os.path.join(
-        constants.GetOutDirectory(), '%s_apk' % options.suite_name,
-        '%s-debug.apk' % options.suite_name)
+        constants.GetOutDirectory(), '%s_apk' % options.suite_name[0],
+        '%s-debug.apk' % options.suite_name[0])
     self._data_deps = []
     self._gtest_filter = options.test_filter
     if options.isolate_file_path:
       self._isolate_abs_path = os.path.abspath(options.isolate_file_path)
       self._isolate_delegate = isolate_delegate
       self._isolated_abs_path = os.path.join(
           constants.GetOutDirectory(), '%s.isolated' % options.suite_name)
     else:
       logging.warning('No isolate file provided. No data deps will be pushed.');
       self._isolate_delegate = None
@@ skipping 70 matching lines @@
       self._isolate_delegate.Clear()
 
   @property
   def apk(self):
     return self._apk_path
 
   @property
   def suite(self):
     return self._suite