Merge "Fix file paths for DumpstateUtil calls in 1.0" am: a108098648 am: 0ecb8220b2 am: 70729b61ac

Change-Id: I68d7d1697046f89d07d33169b65d5e79cd4fd156