Rework how bots get the version of Blink.

masters/master.chromium.webkit/master_android_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
 
 defaults = {}
 
@@ skipping 24 matching lines @@
 #
 T('android_dbg_trigger')
 
 android_dbg_archive = master_config.GetGSUtilUrl(
     'chromium-android', 'webkit_latest_dbg')
 
 #
 # Android dbg builder
 #
 B('Android Builder (dbg)', 'f_android_dbg', scheduler='s9_android_webkit')
-F('f_android_dbg', linux_android().ChromiumWebkitLatestAnnotationFactory(
+F('f_android_dbg', linux_android().ChromiumAnnotationFactory(
     target='Debug',
     annotation_script='src/build/android/buildbot/bb_run_bot.py',
     factory_properties={
         'android_bot_id': 'webkit-latest-builder-dbg',
         'build_url': android_dbg_archive,
         'trigger': 'android_dbg_trigger',
         'prune_limit': 5,
+        'blink_config': 'blink',
         }))
 
 B('Android Tests (dbg)', 'f_android_dbg_tests', None, 'android_dbg_trigger',
   auto_reboot=False)
-F('f_android_dbg_tests', linux_android().ChromiumWebkitLatestAnnotationFactory(
+F('f_android_dbg_tests', linux_android().ChromiumAnnotationFactory(
     target='Debug',
     annotation_script='src/build/android/buildbot/bb_run_bot.py',
     factory_properties={
         'android_bot_id': 'webkit-latest-tests-dbg',
         'build_url': android_dbg_archive,
+        'blink_config': 'blink',
     }))
 
 def Update(config, active_master, c):
   return helper.Update(c)