Merge "Refactor options parsing in dumpstate" am: 22c321c715 am: 81e546fdf5
am: a61c1e1b4f

Change-Id: Ic1919ab14831b44877dae7d26360386ac5a6cfa5