Merge "Refactor options parsing in dumpstate"
am: 22c321c715

Change-Id: I6d721095464a623394f9a8474625673235dd17c0