diff --git a/android/buildbot/bb_run_bot.py b/android/buildbot/bb_run_bot.py
index fcacffe79..158bea957 100755
--- a/android/buildbot/bb_run_bot.py
+++ b/android/buildbot/bb_run_bot.py
@@ -150,7 +150,7 @@ def GetBotStepMap():
         H(compile_step + std_host_tests, experimental, target_arch='x86')),
       B('fyi-builder-dbg',
         H(std_build_steps + std_host_tests, experimental,
-          extra_gyp='emma_coverage=1')),
+          extra_gyp='emma_coverage=1 android_lint=1')),
       B('x86-builder-dbg',
         H(compile_step + std_host_tests, target_arch='x86')),
       B('fyi-builder-rel', H(std_build_steps,  experimental)),
diff --git a/android/gyp/lint.py b/android/gyp/lint.py
index bca8642bb..339d98fd6 100755
--- a/android/gyp/lint.py
+++ b/android/gyp/lint.py
@@ -55,15 +55,17 @@ def _RunLint(lint_path, config_path, processed_config_path, manifest_path,
     print >> sys.stderr
     for issue in issues:
       issue_id = issue.attributes['id'].value
+      severity = issue.attributes['severity'].value
       message = issue.attributes['message'].value
       location_elem = issue.getElementsByTagName('location')[0]
       path = location_elem.attributes['file'].value
       line = location_elem.getAttribute('line')
       if line:
-        error = '%s:%s %s: %s [warning]' % (path, line, message, issue_id)
+        error = '%s:%s %s: %s [%s]' % (path, line, severity, message,
+                                       issue_id)
       else:
         # Issues in class files don't have a line number.
-        error = '%s %s: %s [warning]' % (path, message, issue_id)
+        error = '%s %s: %s [%s]' % (path, severity, message, issue_id)
       print >> sys.stderr, error
       for attr in ['errorLine1', 'errorLine2']:
         error_line = issue.getAttribute(attr)
diff --git a/common.gypi b/common.gypi
index 0bc7cde93..aa13b0cf7 100644
--- a/common.gypi
+++ b/common.gypi
@@ -1027,7 +1027,7 @@
     'emma_filter%': '',
 
     # Set to 1 to enable running Android lint on java/class files.
-    'android_lint%': 1,
+    'android_lint%': 0,
 
     # Set to 1 to force Visual C++ to use legacy debug information format /Z7.
     # This is useful for parallel compilation tools which can't support /Zi.