Merge "Added system property (dumpstate.unroot)."
am: 4c2a2ba8e2

Change-Id: Ibc7e6fae4d2be4d056e1f1505512440f1b6debc9