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/ArmnnDriver.hpp b/1.1/ArmnnDriver.hpp
index ef8bca8..2548c8a 100644
--- a/1.1/ArmnnDriver.hpp
+++ b/1.1/ArmnnDriver.hpp
@@ -7,7 +7,7 @@
 
 #include <HalInterfaces.h>
 
-#include "ArmnnDevice.hpp"
+#include "../ArmnnDevice.hpp"
 #include "ArmnnDriverImpl.hpp"
 #include "HalPolicy.hpp"
 
@@ -114,4 +114,4 @@
 };
 
 } // namespace hal_1_1
-} // namespace armnn_driver
\ No newline at end of file
+} // namespace armnn_driver