Merge "Move dumpstate to calling getprop."