| Index: build/android/buildbot/bb_run_bot.py
 | 
| diff --git a/build/android/buildbot/bb_run_bot.py b/build/android/buildbot/bb_run_bot.py
 | 
| index c729ca2d5f87a0ab5243b24b3ea8b6533ae200a0..03a1d3855036d13c61b9af43e60ffda335dffdb4 100755
 | 
| --- a/build/android/buildbot/bb_run_bot.py
 | 
| +++ b/build/android/buildbot/bb_run_bot.py
 | 
| @@ -115,7 +115,7 @@ def GetCommands(options, bot_config):
 | 
|  
 | 
|  def GetBotStepMap():
 | 
|    compile_step = ['compile']
 | 
| -  std_host_tests = ['check_webview_licenses', 'findbugs']
 | 
| +  std_host_tests = ['check_webview_licenses', 'findbugs', 'lint']
 | 
|    std_build_steps = ['compile', 'zip_build']
 | 
|    std_test_steps = ['extract_build']
 | 
|    std_tests = ['ui', 'unit']
 | 
| @@ -133,10 +133,11 @@ def GetBotStepMap():
 | 
|  
 | 
|    bot_configs = [
 | 
|        # Main builders
 | 
| -      B('main-builder-dbg', H(std_build_steps + std_host_tests)),
 | 
| +      B('main-builder-dbg', H(std_build_steps)),
 | 
|        B('main-builder-rel', H(std_build_steps)),
 | 
|        B('main-clang-builder',
 | 
| -        H(compile_step, extra_gyp='clang=1 component=shared_library')),
 | 
| +        H(compile_step + std_host_tests,
 | 
| +          extra_gyp='clang=1 component=shared_library')),
 | 
|        B('main-clobber', H(compile_step)),
 | 
|        B('main-tests', H(std_test_steps), T(std_tests, [flakiness_server])),
 | 
|  
 | 
| @@ -147,12 +148,12 @@ def GetBotStepMap():
 | 
|        B('chromedriver-fyi-tests-dbg', H(std_test_steps),
 | 
|          T(['chromedriver'], ['--install=ChromiumTestShell'])),
 | 
|        B('fyi-x86-builder-dbg',
 | 
| -        H(compile_step + std_host_tests, experimental, target_arch='x86')),
 | 
| +        H(compile_step, experimental, target_arch='x86')),
 | 
|        B('fyi-builder-dbg',
 | 
| -        H(std_build_steps + std_host_tests, experimental,
 | 
| +        H(std_build_steps, experimental,
 | 
|            extra_gyp='emma_coverage=1')),
 | 
|        B('x86-builder-dbg',
 | 
| -        H(compile_step + std_host_tests, target_arch='x86')),
 | 
| +        H(compile_step, target_arch='x86')),
 | 
|        B('fyi-builder-rel', H(std_build_steps,  experimental)),
 | 
|        B('fyi-tests', H(std_test_steps),
 | 
|          T(std_tests, ['--experimental', flakiness_server,
 | 
| 
 |