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

Change-Id: I73288efc9b2612459a3fe4c5fae4b7472950ebf7