tombstoned: fix a race between intercept and crash_dump. am: df8cb05498
am: 2396b9eb5c

Change-Id: I1ea2073d4ec4b5c7c8425b2f2c37ea5cd59faf36