Merge "dumpstate: Further cleanups related to new stack dumping scheme."