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

Change-Id: I0a9b2921b3bd3b610cf9da67a904ed87e17a3bf6