Merge "dumpstate: move dump_traces to Dumpstate"
am: 6644784ead

Change-Id: I7d3609d6abd6a3021c525cc63244561384a840a6