Cleanup dumpstate for CTS tests

Change-Id: Iefd7f2863b1a2d8974d0cd1c27b1d3b2d3ffbe8e
3 files changed