Merge "Tombstone support for XOM-related SIGSEGVs."
am: 017e12af06

Change-Id: I7929ba7df22891cd0b3b7da2888c9d64ba5d6caa