Rework how bots get the version of Blink.

masters/master.chromium.webkit/master_android_webkit_latest_cfg.py

 # Copyright (c) 2012 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 master import master_config
 from master.factory import chromium_factory
 
 import config
 
@@ skipping 27 matching lines @@
 # Triggerable scheduler for the builder
 #
 T('android_rel_trigger')
 
 android_rel_archive = master_config.GetGSUtilUrl(
     'chromium-android', 'webkit_latest_rel')
 #
 # Android Rel Builder
 #
 B('Android Builder', 'f_android_rel', scheduler='s5_android_webkit')
-F('f_android_rel', linux_android().ChromiumWebkitLatestAnnotationFactory(
+F('f_android_rel', linux_android().ChromiumAnnotationFactory(
     annotation_script='src/build/android/buildbot/bb_run_bot.py',
     factory_properties={
         'android_bot_id': 'webkit-latest-builder-rel',
         'build_url': android_rel_archive,
         'trigger': 'android_rel_trigger',
+        'blink_config': 'blink',
         }))
 
 B('WebKit Android (GalaxyNexus)', 'f_webkit_android_tests', None,
   'android_rel_trigger')
 F('f_webkit_android_tests',
-  linux_android().ChromiumWebkitLatestAnnotationFactory(
+  linux_android().ChromiumAnnotationFactory(
     annotation_script='src/build/android/buildbot/bb_run_bot.py',
     factory_properties={
         'android_bot_id': 'webkit-latest-webkit-tests-rel',
         'archive_webkit_results': ActiveMaster.is_production_host,
         'build_url': android_rel_archive,
         'generate_gtest_json': True,
         'test_results_server': 'test-results.appspot.com',
+        'blink_config': 'blink',
         }))
 
 def Update(_config, active_master, c):
   return helper.Update(c)