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

Change-Id: Iaa55a03a2a1fa3671d1e26bd3c75fed23af8a32f