Merge "Moved some functions to DumpstateUtil.h."