Simplify libneuralnetworks_common* libraries

This change removes AIDL include libraries from
libneuralnetworks_common*, becasue all the AIDL-related code has been
relocated to hardware/interfaces/neuralnetworks/aidl/utils.

Bug: 191442336
Test: mma
Change-Id: I54369b17ee14806b2842fd5026ab79eb5db721a8

common/Android.bp

diff --git a/common/Android.bp b/common/Android.bp
index aedbedc..d50620b 100644
--- a/common/Android.bp
+++ b/common/Android.bp
@@ -97,21 +97,13 @@
 
 // libneuralnetworks_common* provides common utilities for the NNAPI runtime, drivers, and tests to
 // use. Multiple variants of the common library are provided:
-// - libneuralnetworks_common_hidl: the common library without any AIDL dependencies, used by
-//   NNAPI HIDL drivers and tests.
-// - libneuralnetworks_common_aidl(_vx): explicitly versioned common libraries linking against the
-//   corresponding version of the NNAPI sAIDL library, used by NNAPI sAIDL drivers.
-//   We need a variant for every frozen AIDL version because it is not allowed for a build target
-//   to depend on multiple versions of the NNAPI sAIDL library.
-//   libneuralnetworks_common_aidl (without a version listed behind it) is the current version.
-// - libneuralnetworks_common: the common library that links against the latest stable version of
-//   the NNAPI sAIDL library, used by NNAPI runtime and tests.
-// - libneuralnetworks_common_experimental: the common library that links against the "current"
-//   version of the NNAPI sAIDL library with NN_EXPERIMENTAL_FEATURE flag turned on, used by NNAPI
-//   drivers and tests for experimental features.
+// - libneuralnetworks_common_aidl_v1: temporary copy of libneuralnetworks_common.
+// - libneuralnetworks_common: the common library, used by NNAPI runtime and tests.
+// - libneuralnetworks_common_experimental: the common library with NN_EXPERIMENTAL_FEATURE flag
+//   turned on, used by NNAPI drivers and tests for experimental features.
 //
-// In addition to the AIDL dependencies, all variants of the common library also link against all
-// versions (1.0-3) of the NNAPI HIDL library.
+// All variants of the common library also link against all versions (1.0-3) of the NNAPI HIDL
+// library.
 //
 cc_defaults {
     name: "libneuralnetworks_common_defaults",
@@ -226,17 +218,12 @@
     ],
 }
 
+// TODO: remove this once all references to it have been removed.
 cc_library_static {
     name: "libneuralnetworks_common_aidl_v1",
     defaults: [
         "libneuralnetworks_common_defaults",
     ],
-    shared_libs: [
-        "android.hardware.neuralnetworks-V1-ndk",
-    ],
-    whole_static_libs: [
-        "neuralnetworks_utils_hal_aidl_v1",
-    ],
 }
 
 cc_library_static {
@@ -244,12 +231,6 @@
     defaults: [
         "libneuralnetworks_common_defaults",
     ],
-    shared_libs: [
-        "android.hardware.neuralnetworks-V2-ndk",
-    ],
-    whole_static_libs: [
-        "neuralnetworks_utils_hal_aidl",
-    ],
 }
 
 cc_library_static {