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

Change-Id: I3aa6792cfc9c2581d26839510c663294b349d128