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/test/Tests.cpp b/test/Tests.cpp
index 865c6d0..5c388cb 100644
--- a/test/Tests.cpp
+++ b/test/Tests.cpp
@@ -31,9 +31,9 @@
     auto driver = std::make_unique<ArmnnDriver>(DriverOptions(armnn::Compute::CpuRef));
 
     ErrorStatus error;
-    neuralnetworks::V1_0::Capabilities cap;
+    V1_0::Capabilities cap;
 
-    auto cb = [&](ErrorStatus status, const neuralnetworks::V1_0::Capabilities& capabilities)
+    auto cb = [&](ErrorStatus status, const V1_0::Capabilities& capabilities)
     {
         error = status;
         cap = capabilities;