Merge "Add "dumpsys diskstats" to get a dump of disk-free values."