[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: aa4f882208 -s ours am: 0ccf8ac1c1 -s ours

am skip reason: Merged-In I8e4f1f4c57fae1510835733173c505326f39e28f with SHA-1 f5513f5722 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libavc/+/17545184

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

Android.bp

diff --git a/Android.bp b/Android.bp
index eab1fc5..e9efbe5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -15,6 +15,24 @@
     ],
 }
 
+cc_library_headers {
+    name: "libavcdec_headers",
+    export_include_dirs: [
+        "common",
+        "decoder",
+    ],
+    min_sdk_version: "29",
+}
+
+cc_library_headers {
+    name: "libavcenc_headers",
+    export_include_dirs: [
+        "common",
+        "encoder",
+    ],
+    min_sdk_version: "29",
+}
+
 cc_library_static {
     name: "libavcdec",
     vendor_available: true,
@@ -36,8 +54,8 @@
     ],
 
     export_include_dirs: [
-        "decoder",
         "common",
+        "decoder",
     ],
 
     srcs: [
@@ -282,8 +300,8 @@
     ],
 
     export_include_dirs: [
-        "encoder",
         "common",
+        "encoder",
     ],
 
     srcs: [ //Rate Control