Merge "Fix file paths for DumpstateUtil calls in 1.0" into rvc-dev am: 3b491b4812

Change-Id: I8770cd1c0df6515630890a95ef5958e1e9a2ac68