Merge "dumpstate: Remove df from bugreport and add vold system dump"