Dumpstate: Use unique_fd
am: fcc8db9a36

Change-Id: Ib0d62a2c4e449a00c61e8c2c7ac13acb1d1e58d4