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

Change-Id: If4f430ade061364ffb5624bd5b8af61f9001e78b