Merge "Remove outfile option from dumpstate" am: 4bcfa50ce9 am: 12cefbc507
am: a6366c9fe0

Change-Id: I1a850ab2a20a25e1777670dc06c9c7c9841cfa17