Merge "Tombstone support for XOM-related SIGSEGVs."