Revert "split out libhidl-gen and libhidl-gen-utils"

This reverts commit 1316091aaf89abc73ab11539b61b20f13ee261c4.

Change-Id: I97acad6cadd847cb5540ffe0258b081d7901c1e9
diff --git a/generateCppImpl.cpp b/generateCppImpl.cpp
index bed1d1d..e882fe3 100644
--- a/generateCppImpl.cpp
+++ b/generateCppImpl.cpp
@@ -18,18 +18,19 @@
 
 #include "Coordinator.h"
 #include "EnumType.h"
+#include "Formatter.h"
 #include "Interface.h"
 #include "Method.h"
 #include "ScalarType.h"
 #include "Scope.h"
 
 #include <algorithm>
-#include <hidl-util/Formatter.h>
 #include <android-base/logging.h>
 #include <string>
 #include <vector>
 #include <set>
 
+
 namespace android {
 
 status_t AST::generateCppImpl(const std::string &outputPath) const {