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

Change-Id: I36e78e8fae56f8c5e89b9ca6a281942dff4ddfb8