Merge "Remove ftrace dumping from dumpstate"
am: 63f4441a02

Change-Id: I907e983ef356c5368957de79a6d7ae2ddeec9984