Refactor the way that TestApi works so that it is actually useful.

scripts/slave/recipe_modules/chromium_android/config.py

 # Copyright 2013 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 slave.recipe_configs_util import config_item_context, ConfigGroup
-from slave.recipe_configs_util import Dict, Single, Static
+from slave.recipe_config import config_item_context, ConfigGroup
+from slave.recipe_config import Dict, Single, Static
 
 def BaseConfig(INTERNAL, REPO_NAME, REPO_URL, **_kwargs):
   return ConfigGroup(
     INTERNAL = Static(INTERNAL),
     REPO_NAME = Static(REPO_NAME),
     REPO_URL = Static(REPO_URL),
     target_arch = Single(basestring, required=False, empty_val=''),
-    custom_vars = Dict(value_type=basestring),
     extra_env = Dict(value_type=(basestring,int,list)),
     run_findbugs = Single(bool, required=False, empty_val=False),
     run_lint = Single(bool, required=False, empty_val=False),
     run_checkdeps = Single(bool, required=False, empty_val=False)
   )
 
 
 VAR_TEST_MAP = {
   'INTERNAL': [True, False],
   'REPO_NAME': ['src', 'internal'],
@@ skipping 34 matching lines @@
     'ANDROID_SDK_BUILD_TOOLS_VERSION': 'android-KeyLimePie',
     'ANDROID_SDK_ROOT': ['third_party', 'android_tools_internal', 'sdk'],
     'ANDROID_SDK_VERSION': 'KeyLimePie'
   }
 
 @config_ctx()
 def try_builder(c):
   if c.INTERNAL:
     c.run_findbugs = True
     c.run_lint = True