Snap for 7402811 from e05f3ba60e836bcd54b41a2b0c47b3cdf4dc2bf2 to sc-release

Change-Id: Iabe9f20ba749e8ab74c696193c2007962cedf144

tests/aidl/Android.bp

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: {