Merge "Added system property (dumpstate.unroot) to run dumpstate as shell."