Fix android recipe build upload names

scripts/slave/recipe_modules/perf_try/build_state.py

 # Copyright 2015 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 uuid
 
 # This is a wrapper class of revision that stores its build path and
 # queries its status. Part of the code are adapted from the RevisionState
 # class from auto-bisect module
@@ skipping 23 matching lines @@
     return self._get_platform_gs_prefix() + revision_suffix
 
   def _get_platform_gs_prefix(self): # pragma: no cover
     bot_name = self.api.m.properties.get('buildername', '')
     if 'win' in bot_name:
       if any(b in bot_name for b in ['x64', 'gpu']):
         return 'gs://%s/Win x64 Builder/full-build-win32_' % self.bucket
       return 'gs://%s/Win Builder/full-build-win32_' % self.bucket
     if 'android' in bot_name:
       if 'nexus9' in bot_name or 'nexus5x' in bot_name:
-        return 'gs://%s/android_perf_rel_arm64/full-build-linux_' % self.bucket
-      return 'gs://%s/android_perf_rel/full-build-linux_' % self.bucket
+        return 'gs://%s/Android arm64 Builder/full-build-linux_' % self.bucket
+      return 'gs://%s/Android Builder/full-build-linux_' % self.bucket
     if 'mac' in bot_name:
       return 'gs://%s/Mac Builder/full-build-mac_' % self.bucket
     return 'gs://%s/Linux Builder/full-build-linux' % self.bucket
 
   def _is_completed(self):
     result = self.api.m.buildbucket.get_build(
         self.build_id,
         step_test_data=lambda: self.api.m.json.test_api.output_stream(
             {'build': {'status': 'COMPLETED'}}
         ))
@@ skipping 133 matching lines @@
               import sys
               shutil.move(sys.argv[1], sys.argv[2])
               """,
               args=[zip_dir, build_dir])
       else:
         self.api.m.chromium_tests.download_and_unzip_build(
             mastername, buildername, update_step, bot_db,
             build_archive_url=self.build_file_path,
             build_revision=self.commit_hash,
             override_bot_type='tester')