Fix android recipe build upload names

scripts/slave/recipes/android/builder.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.
 
 from contextlib import contextmanager
 from recipe_engine import recipe_api
 from recipe_engine.types import freeze
 
 DEPS = [
   'chromium',
@@ skipping 34 matching lines @@
   },
   'chromium.perf': {
     'Android Builder': {
       'recipe_config': 'main_builder_rel_mb',
       'gclient_apply_config': ['android', 'perf'],
       'kwargs': {
         'BUILD_CONFIG': 'Release',
       },
       'upload': {
         'bucket': 'chrome-perf',
-        'path': lambda api: ('android_perf_rel/full-build-linux_%s.zip'
+        'path': lambda api: ('Android Builder/full-build-linux_%s.zip'
                              % api.properties['revision']),
       },
       'run_mb': True,
       'targets': [
         'android_tools',
         'cc_perftests',
         'chrome_public_apk',
         'gpu_perftests',
         'push_apps_to_background_apk',
         'system_webview_apk',
@@ skipping 12 matching lines @@
     },
     'Android arm64 Builder': {
       'recipe_config': 'arm64_builder_rel_mb',
       'gclient_apply_config': ['android', 'perf'],
       'kwargs': {
         'BUILD_CONFIG': 'Release',
       },
       'upload': {
         'bucket': 'chrome-perf',
         'path': lambda api: (
-            'android_perf_rel_arm64/full-build-linux_%s.zip'
+            'Android arm64 Builder/full-build-linux_%s.zip'
             % api.properties['revision']),
       },
       'run_mb': True,
       'targets': [
         'android_tools',
         'cc_perftests',
         'chrome_public_apk',
         'gpu_perftests',
         'push_apps_to_background_apk',
         'system_webview_apk',
@@ skipping 165 matching lines @@
         '_'.join(_sanitize_nonalpha(step) for step in steps))) +
       props(mastername=mastername, buildername=buildername) +
       reduce(lambda a, b: a + b,
              (api.step_data(step, retcode=1) for step in steps))
     )
 
   yield step_failure(mastername='chromium.android',
                      buildername='Android x64 Builder (dbg)',
                      steps=['check licenses'])