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

Change-Id: Id592067d8aa795b954dd54545d16e120c1dd205d