IVGCVSW-1806 More Android NN Driver refactoring

 * Changed #if defined to #ifdef
 * Simplified the Android ML namespace resolution
 * Fixed the relative path in some include directives

Change-Id: I46e46faff98559c8042c1a4b8b82007f462df57d
diff --git a/1.1/HalPolicy.hpp b/1.1/HalPolicy.hpp
index 5efe813..af85878 100644
--- a/1.1/HalPolicy.hpp
+++ b/1.1/HalPolicy.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "ConversionUtils.hpp"
+#include "../ConversionUtils.hpp"
 
 #include <HalInterfaces.h>