Consolidate all util.hpp

This deletes all lower level util.hpp and cats them
into the top level util.hpp to avoid name conflicts.

Change-Id: Ia11e4a08053a3970b0aadf21d1156ab26def36bd
Signed-off-by: James Feist <james.feist@linux.intel.com>
diff --git a/dbus/dbusactiveread.hpp b/dbus/dbusactiveread.hpp
index b703006..235f038 100644
--- a/dbus/dbusactiveread.hpp
+++ b/dbus/dbusactiveread.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "dbus/util.hpp"
 #include "interfaces.hpp"
+#include "util.hpp"
 
 #include <memory>
 #include <sdbusplus/bus.hpp>