Merge changes from topic "b188871598-security" am: 067901ea81 am: bbde18214d am: da9033bda5 am: 3667638bfe am: 59030cc764

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1814146

Change-Id: Ic0298e3f4fbabeab4764776dfefac4078d00c736
diff --git a/neuralnetworks/aidl/Android.bp b/neuralnetworks/aidl/Android.bp
index 951cdd5..3a69936 100644
--- a/neuralnetworks/aidl/Android.bp
+++ b/neuralnetworks/aidl/Android.bp
@@ -16,8 +16,8 @@
     ],
     stability: "vintf",
     imports: [
-        "android.hardware.common",
-        "android.hardware.graphics.common",
+        "android.hardware.common-V2",
+        "android.hardware.graphics.common-V2",
     ],
     backend: {
         java: {