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

Change-Id: Ic70c2d879072ad190bc28259f914fbfbfe5d259b