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

Change-Id: Iabdaba8135e2cb4273b8a6e9b2c90422edb4e694