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

Change-Id: Id381abb1e943c70932bb87c4704da1e1b176a10b