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

Change-Id: I11cd28898c46b5d228f0655e17ad1285bfdbccec