Merge "Remove util.cpp and move all functions(unmodified) to dumpstate.cpp"