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

Change-Id: I06d10a295a02931ee360d9259d811c873b5d2e5d