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

Change-Id: I6453cf922f294809e57f635f3e060dcb78a62e68