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

Change-Id: Ia1fa3f0566f7229afe06c7cd409b1cbe419a785b