[automerger skipped] Modify crash handling now that SIGABRT is handled gracefully. am: 4a45e13d68 am: a28865df02  -s ours am: 78a0cda761  -s ours
am: 1d4c725920  -s ours

Change-Id: Ic5319053be185fd1416bf9d4eaec3268ef3ea7fb