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

Change-Id: I0a1c88d32e87da02b1f7876f44e203a7bec24364