Merge "Dump system server stack trace on watchdog failure"