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

Change-Id: I30dd8954778df29cc96311345280d7f8fca7f71d