Snap for 7401515 from 810ac7a95c3aa0602a341122b27a109ce01d1152 to sc-v2-release

Change-Id: I1449aa4668a00ec9158bce85e15302f7e44f9403
diff --git a/tests/aidl/Android.bp b/tests/aidl/Android.bp
index c5010ce..e210fda 100644
--- a/tests/aidl/Android.bp
+++ b/tests/aidl/Android.bp
@@ -11,8 +11,8 @@
         "android/fmq/test/*.aidl",
     ],
     imports: [
-        "android.hardware.common",
-        "android.hardware.common.fmq",
+        "android.hardware.common-V2",
+        "android.hardware.common.fmq-V1",
     ],
     gen_trace: true,
     backend: {