IVGCVSW-1998 : replace Compute enum in LayerSupport free functions

!android-nn-driver:153490

Change-Id: I1c2a5f942e3a1c3626e093c90545ca27c64ba5e8
diff --git a/Android.mk b/Android.mk
index 25ed834..7493374 100644
--- a/Android.mk
+++ b/Android.mk
@@ -204,13 +204,14 @@
 
 LOCAL_STATIC_LIBRARIES := \
 	libneuralnetworks_common \
-	libarmnn \
 	libboost_log \
 	libboost_system \
 	libboost_unit_test_framework \
 	libboost_thread \
 	armnn-arm_compute
 
+LOCAL_WHOLE_STATIC_LIBRARIES := libarmnn
+
 LOCAL_SHARED_LIBRARIES := \
 	libbase \
 	libhidlbase \