Merge "dumpstate: use /system/xbin/su directly"