[Android] Add --blacklist-file as a command-line option.

build/android/tombstones.py

Index: build/android/tombstones.py
diff --git a/build/android/tombstones.py b/build/android/tombstones.py
index dbfe3f76c2887270eeeb90fd02ea31fead5b574c..19b802b297f9089778a8d4fa879b00044842ae95 100755
--- a/build/android/tombstones.py
+++ b/build/android/tombstones.py
@@ -20,6 +20,7 @@ import sys
 import optparse
 
 from pylib.device import adb_wrapper
+from pylib.device import device_blacklist
 from pylib.device import device_errors
 from pylib.device import device_utils
 from pylib.utils import run_tests_helper
@@ -220,6 +221,7 @@ def main():
   parser.add_option('--device',
                     help='The serial number of the device. If not specified '
                          'will use all devices.')
+  parser.add_option('--blacklist-file', help='Device blacklist JSON file.')
   parser.add_option('-a', '--all-tombstones', action='store_true',
                     help="""Resolve symbols for all tombstones, rather than just
                          the most recent""")
@@ -233,10 +235,15 @@ def main():
                          'crash stacks.')
   options, _ = parser.parse_args()
 
+  if options.blacklist_file:
+    blacklist = device_blacklist.Blacklist(options.blacklist_file)
+  else:
+    blacklist = None
+
   if options.device:
     devices = [device_utils.DeviceUtils(options.device)]
   else:
-    devices = device_utils.DeviceUtils.HealthyDevices()
+    devices = device_utils.DeviceUtils.HealthyDevices(blacklist)
 
   # This must be done serially because strptime can hit a race condition if
   # used for the first time in a multithreaded environment.