Merge "Separate options parsing from running dumpstate" am: fdfffe152a am: 36bf83d027
am: e5fa40f628

Change-Id: I65d82e79a7c6959e3c990490d6b5557b8bfdbfc8