IVGCVSW-1806: Refactor Android-NN-Driver ModelToINetworkConverter

* Moved conversion logic into new V1_0 and V1_1 HalPolicy classes
* Extracted common helper functions into ConversionUtils class

Change-Id: I1ab50edc266dd528c0cb22a5cd1aa65e103674d9

1 files changed, 4 insertions, 5 deletions

diff --git a/Utils.hpp b/Utils.hpp
index a4402f25..812dfbd5 100644
--- a/Utils.hpp
+++ b/Utils.hpp
@@ -5,12 +5,11 @@
 
 #pragma once
 
-#include "ArmnnDriver.hpp"
-
-#include <NeuralNetworks.h>
-
 #include <armnn/ArmNN.hpp>
+
 #include <CpuExecutor.h>
+#include <HalInterfaces.h>
+#include <NeuralNetworks.h>
 
 #include <boost/format.hpp>
 #include <log/log.h>
@@ -131,4 +130,4 @@ void ExportNetworkGraphToDotFile(const armnn::IOptimizedNetwork& optimizedNetwor
     }
 }
 
-}
+} // namespace armnn_driver
\ No newline at end of file