Added tombstones in instrumentation tests results.

build/android/pylib/local/device/local_device_instrumentation_test_run.py

Index: build/android/pylib/local/device/local_device_instrumentation_test_run.py
diff --git a/build/android/pylib/local/device/local_device_instrumentation_test_run.py b/build/android/pylib/local/device/local_device_instrumentation_test_run.py
index 26d10f4d1d7ed797a4682a0acae6ff13b382281e..fcbe152decfbb7749d42704be1f0909b1d5620a1 100644
--- a/build/android/pylib/local/device/local_device_instrumentation_test_run.py
+++ b/build/android/pylib/local/device/local_device_instrumentation_test_run.py
@@ -6,6 +6,7 @@ import logging
 import os
 import posixpath
 import re
+import sys
 import time
 
 from devil.android import device_errors
@@ -16,6 +17,9 @@ from pylib.base import base_test_result
 from pylib.local.device import local_device_environment
 from pylib.local.device import local_device_test_run
 
+sys.path.append(os.path.join('..', '..', '..'))
+import tombstones
+
 
 TIMEOUT_ANNOTATIONS = [
   ('Manual', 10 * 60 * 60),
@@ -143,6 +147,8 @@ class LocalDeviceInstrumentationTestRun(
       else:
         for step in steps:
           step()
+      if self._test_instance.store_tombstones:
+        tombstones.ClearAllTombstones(dev)
 
     self._env.parallel_devices.pMap(
         individual_device_set_up,
@@ -329,6 +335,11 @@ class LocalDeviceInstrumentationTestRun(
           self._test_instance.coverage_directory)
       device.RunShellCommand('rm -f %s' % os.path.join(coverage_directory,
           '*'))
+    if self._test_instance.store_tombstones:
+      for result in results:
+        if result.GetType() == base_test_result.ResultType.FAIL:
+          tombstones.ResolveAllTombstones(device, True, False, True)
+          result.set_tombstones(tombstones)
     return results
 
   #override