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

Change-Id: I2b1529957c092f686b17f030a98912973f184735