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

Change-Id: Idf45cd614971b4ad7e0eb54f85048ef9967c594c