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

Change-Id: I911174646bc87913cd606d0ad75b539d580a13ed