Merge changes from topic "OMAPI_VNTF" am: f7a480d824 am: 8989606294 am: 746c751732

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1891499

Change-Id: Id763b94253a7ef9f18fc6e81a3886367f5db3d11

omapi/aidl/Android.bp

@@ -28,5 +28,8 @@ aidl_interface {
         rust: {
             enabled: true,
         },
+        ndk: {
+            separate_platform_variant: false,
+        },
     },
 }

omapi/aidl/vts/functional/AccessControlApp/Android.bp

@@ -38,7 +38,7 @@ cc_test {
     ],
     static_libs: [
         "VtsHalHidlTargetTestBase",
-        "android.se.omapi-V1-ndk_platform",
+        "android.se.omapi-V1-ndk",
     ],
     cflags: [
         "-O0",

omapi/aidl/vts/functional/omapi/Android.bp

@@ -38,7 +38,7 @@ cc_test {
     ],
     static_libs: [
         "VtsHalHidlTargetTestBase",
-        "android.se.omapi-V1-ndk_platform",
+        "android.se.omapi-V1-ndk",
     ],
     cflags: [
         "-O0",