Merge "Fix file paths for DumpstateUtil calls in 1.0" am: a108098648

Change-Id: I2d6bed4f5f0fcb9c0f198e8cd6563ef586af0f8c