Merge "Fix file paths for DumpstateUtil calls in 1.0"