Merge "media.c2: add apex_available and set minsdk to 31" into main am: bea101032f am: 6590f39160 am: 0dac42e170 am: acf6a65e2b

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

Change-Id: If3830d469eee85130db1a6b5e8efa150d19837df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

media/c2/aidl/Android.bp

@@ -11,11 +11,12 @@ package {
 
 aidl_interface {
     name: "android.hardware.media.c2",
+    min_sdk_version: "31",
     vendor_available: true,
     double_loadable: true,
     srcs: ["android/hardware/media/c2/*.aidl"],
-    include_dirs: [
-        "frameworks/base/core/java",
+    headers: [
+        "HardwareBuffer_aidl",
     ],
     imports: [
         "android.hardware.common-V2",
@@ -31,6 +32,11 @@ aidl_interface {
         },
         ndk: {
             enabled: true,
+            apex_available: [
+                "//apex_available:platform",
+                "com.android.media.swcodec",
+                "test_com.android.media.swcodec",
+            ],
             additional_shared_libraries: [
                 "libnativewindow",
             ],