Snap for 6198741 from 4232fc6eedd7282b9449cab06b0207925c67bb8a to sdk-release

Change-Id: I4ac8971d8ab2a5862bec2c985695dac3d9ce4f46
diff --git a/Android.bp b/Android.bp
index 8d586af..b83f2b1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -4,72 +4,72 @@
 prebuilt_etc {
     name: "llndk.libraries.28.txt",
     target: {
-        android_arm: {
-            src: "arm/configs/llndk.libraries.28.txt",
-        },
         android_arm64: {
             src: "arm64/configs/llndk.libraries.28.txt",
         },
-        android_x86: {
-            src: "x86/configs/llndk.libraries.28.txt",
+        android_arm: {
+            src: "arm/configs/llndk.libraries.28.txt",
         },
         android_x86_64: {
             src: "x86_64/configs/llndk.libraries.28.txt",
         },
+        android_x86: {
+            src: "x86/configs/llndk.libraries.28.txt",
+        },
     },
 }
 
 prebuilt_etc {
     name: "vndksp.libraries.28.txt",
     target: {
-        android_arm: {
-            src: "arm/configs/vndksp.libraries.28.txt",
-        },
         android_arm64: {
             src: "arm64/configs/vndksp.libraries.28.txt",
         },
-        android_x86: {
-            src: "x86/configs/vndksp.libraries.28.txt",
+        android_arm: {
+            src: "arm/configs/vndksp.libraries.28.txt",
         },
         android_x86_64: {
             src: "x86_64/configs/vndksp.libraries.28.txt",
         },
+        android_x86: {
+            src: "x86/configs/vndksp.libraries.28.txt",
+        },
     },
 }
 
 prebuilt_etc {
     name: "vndkcore.libraries.28.txt",
     target: {
-        android_arm: {
-            src: "arm/configs/vndkcore.libraries.28.txt",
-        },
         android_arm64: {
             src: "arm64/configs/vndkcore.libraries.28.txt",
         },
-        android_x86: {
-            src: "x86/configs/vndkcore.libraries.28.txt",
+        android_arm: {
+            src: "arm/configs/vndkcore.libraries.28.txt",
         },
         android_x86_64: {
             src: "x86_64/configs/vndkcore.libraries.28.txt",
         },
+        android_x86: {
+            src: "x86/configs/vndkcore.libraries.28.txt",
+        },
     },
 }
 
 prebuilt_etc {
     name: "vndkprivate.libraries.28.txt",
     target: {
-        android_arm: {
-            src: "arm/configs/vndkprivate.libraries.28.txt",
-        },
         android_arm64: {
             src: "arm64/configs/vndkprivate.libraries.28.txt",
         },
-        android_x86: {
-            src: "x86/configs/vndkprivate.libraries.28.txt",
+        android_arm: {
+            src: "arm/configs/vndkprivate.libraries.28.txt",
         },
         android_x86_64: {
             src: "x86_64/configs/vndkprivate.libraries.28.txt",
         },
+        android_x86: {
+            src: "x86/configs/vndkprivate.libraries.28.txt",
+        },
     },
 }
 
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libminijail.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libminijail.so
index 22be2bc..7c17959 100755
--- a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libminijail.so
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libminijail.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libminijail.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libminijail.so
index 22be2bc..7c17959 100755
--- a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libminijail.so
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libminijail.so
Binary files differ
diff --git a/arm64/arch-arm-armv8-a/shared/vndk-core/libminijail.so b/arm64/arch-arm-armv8-a/shared/vndk-core/libminijail.so
index 8c2d723..6fba408 100755
--- a/arm64/arch-arm-armv8-a/shared/vndk-core/libminijail.so
+++ b/arm64/arch-arm-armv8-a/shared/vndk-core/libminijail.so
Binary files differ
diff --git a/arm64/arch-arm64-armv8-a/shared/vndk-core/libminijail.so b/arm64/arch-arm64-armv8-a/shared/vndk-core/libminijail.so
index e53a1f0..5550456 100755
--- a/arm64/arch-arm64-armv8-a/shared/vndk-core/libminijail.so
+++ b/arm64/arch-arm64-armv8-a/shared/vndk-core/libminijail.so
Binary files differ
diff --git a/common/Android.bp b/common/Android.bp
index 8d2d3d5..49aabea 100644
--- a/common/Android.bp
+++ b/common/Android.bp
@@ -2,6 +2,286 @@
 // DO NOT EDIT
 
 filegroup {
+    name: "vndk-v28-libz.so-notice",
+    srcs: ["NOTICE_FILES/libz.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libxml2.so-notice",
+    srcs: ["NOTICE_FILES/libxml2.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libtinyalsa.so-notice",
+    srcs: ["NOTICE_FILES/libtinyalsa.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libcurl.so-notice",
+    srcs: ["NOTICE_FILES/libcurl.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libmedia_helper.so-notice",
+    srcs: ["NOTICE_FILES/libmedia_helper.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libutils.so-notice",
+    srcs: ["NOTICE_FILES/libutils.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libpuresoftkeymasterdevice.so-notice",
+    srcs: ["NOTICE_FILES/libpuresoftkeymasterdevice.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libstagefright_enc_common.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_enc_common.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libstagefright_foundation.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_foundation.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libpcre2.so-notice",
+    srcs: ["NOTICE_FILES/libpcre2.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libui.so-notice",
+    srcs: ["NOTICE_FILES/libui.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libstagefright_soft_flacenc.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_soft_flacenc.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libkeymaster_messages.so-notice",
+    srcs: ["NOTICE_FILES/libkeymaster_messages.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libstagefright_soft_g711dec.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_soft_g711dec.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libhwbinder_noltopgo.so-notice",
+    srcs: ["NOTICE_FILES/libhwbinder_noltopgo.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libnetutils.so-notice",
+    srcs: ["NOTICE_FILES/libnetutils.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libldacBT_abr.so-notice",
+    srcs: ["NOTICE_FILES/libldacBT_abr.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libaudioroute.so-notice",
+    srcs: ["NOTICE_FILES/libaudioroute.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libstagefright_soft_flacdec.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_soft_flacdec.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libstagefright_omx_utils.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_omx_utils.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libcutils.so-notice",
+    srcs: ["NOTICE_FILES/libcutils.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libstagefright_soft_amrdec.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_soft_amrdec.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libpower.so-notice",
+    srcs: ["NOTICE_FILES/libpower.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libstagefright_soft_amrwbenc.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_soft_amrwbenc.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libnl.so-notice",
+    srcs: ["NOTICE_FILES/libnl.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libstagefright_soft_mpeg4dec.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_soft_mpeg4dec.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libsoftkeymasterdevice.so-notice",
+    srcs: ["NOTICE_FILES/libsoftkeymasterdevice.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libstagefright_soft_amrnbenc.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_soft_amrnbenc.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libprotobuf-cpp-lite.so-notice",
+    srcs: ["NOTICE_FILES/libprotobuf-cpp-lite.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libcompiler_rt.so-notice",
+    srcs: ["NOTICE_FILES/libcompiler_rt.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libstagefright_soft_aacdec.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_soft_aacdec.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libhardware.so-notice",
+    srcs: ["NOTICE_FILES/libhardware.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libstagefright_soft_vpxdec.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_soft_vpxdec.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libmedia_omx.so-notice",
+    srcs: ["NOTICE_FILES/libmedia_omx.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libjpeg.so-notice",
+    srcs: ["NOTICE_FILES/libjpeg.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libblas.so-notice",
+    srcs: ["NOTICE_FILES/libblas.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libspeexresampler.so-notice",
+    srcs: ["NOTICE_FILES/libspeexresampler.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libsqlite.so-notice",
+    srcs: ["NOTICE_FILES/libsqlite.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-liblz4.so-notice",
+    srcs: ["NOTICE_FILES/liblz4.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libstagefright_soft_aacenc.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_soft_aacenc.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libopus.so-notice",
+    srcs: ["NOTICE_FILES/libopus.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libevent.so-notice",
+    srcs: ["NOTICE_FILES/libevent.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libstagefright_soft_rawdec.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_soft_rawdec.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libprotobuf-cpp-full.so-notice",
+    srcs: ["NOTICE_FILES/libprotobuf-cpp-full.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libunwind.so-notice",
+    srcs: ["NOTICE_FILES/libunwind.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libpagemap.so-notice",
+    srcs: ["NOTICE_FILES/libpagemap.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libldacBT_enc.so-notice",
+    srcs: ["NOTICE_FILES/libldacBT_enc.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libpiex.so-notice",
+    srcs: ["NOTICE_FILES/libpiex.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libstagefright_soft_vpxenc.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_soft_vpxenc.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libstagefright_soft_gsmdec.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_soft_gsmdec.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libcrypto.so-notice",
+    srcs: ["NOTICE_FILES/libcrypto.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libexif.so-notice",
+    srcs: ["NOTICE_FILES/libexif.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libstagefright_soft_mp3dec.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_soft_mp3dec.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libhardware_legacy.so-notice",
+    srcs: ["NOTICE_FILES/libhardware_legacy.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libstagefright_omx.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_omx.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libstagefright_soft_mpeg4enc.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_soft_mpeg4enc.so.txt"],
+}
+
+filegroup {
     name: "vndk-v28-libminijail.so-notice",
     srcs: ["NOTICE_FILES/libminijail.so.txt"],
 }
@@ -12,43 +292,8 @@
 }
 
 filegroup {
-    name: "vndk-v28-libpagemap.so-notice",
-    srcs: ["NOTICE_FILES/libpagemap.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libpiex.so-notice",
-    srcs: ["NOTICE_FILES/libpiex.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libhwbinder_noltopgo.so-notice",
-    srcs: ["NOTICE_FILES/libhwbinder_noltopgo.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libldacBT_abr.so-notice",
-    srcs: ["NOTICE_FILES/libldacBT_abr.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libz.so-notice",
-    srcs: ["NOTICE_FILES/libz.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libstagefright_soft_g711dec.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_g711dec.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libldacBT_enc.so-notice",
-    srcs: ["NOTICE_FILES/libldacBT_enc.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libhardware.so-notice",
-    srcs: ["NOTICE_FILES/libhardware.so.txt"],
+    name: "vndk-v28-libssl.so-notice",
+    srcs: ["NOTICE_FILES/libssl.so.txt"],
 }
 
 filegroup {
@@ -57,88 +302,8 @@
 }
 
 filegroup {
-    name: "vndk-v28-libspeexresampler.so-notice",
-    srcs: ["NOTICE_FILES/libspeexresampler.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libjpeg.so-notice",
-    srcs: ["NOTICE_FILES/libjpeg.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libnetutils.so-notice",
-    srcs: ["NOTICE_FILES/libnetutils.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libstagefright_soft_aacdec.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_aacdec.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libprotobuf-cpp-full.so-notice",
-    srcs: ["NOTICE_FILES/libprotobuf-cpp-full.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libpuresoftkeymasterdevice.so-notice",
-    srcs: ["NOTICE_FILES/libpuresoftkeymasterdevice.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libevent.so-notice",
-    srcs: ["NOTICE_FILES/libevent.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libstagefright_omx.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_omx.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libstagefright_soft_gsmdec.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_gsmdec.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libstagefright_soft_vorbisdec.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_vorbisdec.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libcompiler_rt.so-notice",
-    srcs: ["NOTICE_FILES/libcompiler_rt.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libhwbinder.so-notice",
-    srcs: ["NOTICE_FILES/libhwbinder.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libvorbisidec.so-notice",
-    srcs: ["NOTICE_FILES/libvorbisidec.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libpower.so-notice",
-    srcs: ["NOTICE_FILES/libpower.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libblas.so-notice",
-    srcs: ["NOTICE_FILES/libblas.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libcurl.so-notice",
-    srcs: ["NOTICE_FILES/libcurl.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libstagefright_omx_utils.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_omx_utils.so.txt"],
+    name: "vndk-v28-libstagefright_flacdec.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_flacdec.so.txt"],
 }
 
 filegroup {
@@ -147,13 +312,8 @@
 }
 
 filegroup {
-    name: "vndk-v28-libopus.so-notice",
-    srcs: ["NOTICE_FILES/libopus.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-liblz4.so-notice",
-    srcs: ["NOTICE_FILES/liblz4.so.txt"],
+    name: "vndk-v28-libhwbinder.so-notice",
+    srcs: ["NOTICE_FILES/libhwbinder.so.txt"],
 }
 
 filegroup {
@@ -162,13 +322,8 @@
 }
 
 filegroup {
-    name: "vndk-v28-libui.so-notice",
-    srcs: ["NOTICE_FILES/libui.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libstagefright_soft_amrdec.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_amrdec.so.txt"],
+    name: "vndk-v28-libstagefright_soft_vorbisdec.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_soft_vorbisdec.so.txt"],
 }
 
 filegroup {
@@ -177,166 +332,11 @@
 }
 
 filegroup {
-    name: "vndk-v28-libcrypto.so-notice",
-    srcs: ["NOTICE_FILES/libcrypto.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libprotobuf-cpp-lite.so-notice",
-    srcs: ["NOTICE_FILES/libprotobuf-cpp-lite.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libsqlite.so-notice",
-    srcs: ["NOTICE_FILES/libsqlite.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libstagefright_enc_common.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_enc_common.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libssl.so-notice",
-    srcs: ["NOTICE_FILES/libssl.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libxml2.so-notice",
-    srcs: ["NOTICE_FILES/libxml2.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libstagefright_soft_mpeg4dec.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_mpeg4dec.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libtinyalsa.so-notice",
-    srcs: ["NOTICE_FILES/libtinyalsa.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libsoftkeymasterdevice.so-notice",
-    srcs: ["NOTICE_FILES/libsoftkeymasterdevice.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libnl.so-notice",
-    srcs: ["NOTICE_FILES/libnl.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libmedia_helper.so-notice",
-    srcs: ["NOTICE_FILES/libmedia_helper.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libstagefright_foundation.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_foundation.so.txt"],
-}
-
-filegroup {
     name: "vndk-v28-libkeymaster_portable.so-notice",
     srcs: ["NOTICE_FILES/libkeymaster_portable.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libhardware_legacy.so-notice",
-    srcs: ["NOTICE_FILES/libhardware_legacy.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libexif.so-notice",
-    srcs: ["NOTICE_FILES/libexif.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libunwind.so-notice",
-    srcs: ["NOTICE_FILES/libunwind.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libstagefright_soft_mp3dec.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_mp3dec.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libstagefright_soft_flacdec.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_flacdec.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libstagefright_soft_amrwbenc.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_amrwbenc.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libstagefright_soft_aacenc.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_aacenc.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libaudioroute.so-notice",
-    srcs: ["NOTICE_FILES/libaudioroute.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libstagefright_soft_mpeg4enc.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_mpeg4enc.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libkeymaster_messages.so-notice",
-    srcs: ["NOTICE_FILES/libkeymaster_messages.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libstagefright_soft_rawdec.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_rawdec.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libstagefright_flacdec.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_flacdec.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libmedia_omx.so-notice",
-    srcs: ["NOTICE_FILES/libmedia_omx.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libutils.so-notice",
-    srcs: ["NOTICE_FILES/libutils.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libcutils.so-notice",
-    srcs: ["NOTICE_FILES/libcutils.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libstagefright_soft_flacenc.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_flacenc.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libstagefright_soft_vpxenc.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_vpxenc.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libstagefright_soft_amrnbenc.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_amrnbenc.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libstagefright_soft_vpxdec.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_vpxdec.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libpcre2.so-notice",
-    srcs: ["NOTICE_FILES/libpcre2.so.txt"],
+    name: "vndk-v28-libvorbisidec.so-notice",
+    srcs: ["NOTICE_FILES/libvorbisidec.so.txt"],
 }
diff --git a/x86/arch-x86-x86/shared/vndk-core/libminijail.so b/x86/arch-x86-x86/shared/vndk-core/libminijail.so
index d4f6594..28c0932 100755
--- a/x86/arch-x86-x86/shared/vndk-core/libminijail.so
+++ b/x86/arch-x86-x86/shared/vndk-core/libminijail.so
Binary files differ
diff --git a/x86/binder32/arch-x86-x86/shared/vndk-core/libminijail.so b/x86/binder32/arch-x86-x86/shared/vndk-core/libminijail.so
index d4f6594..28c0932 100755
--- a/x86/binder32/arch-x86-x86/shared/vndk-core/libminijail.so
+++ b/x86/binder32/arch-x86-x86/shared/vndk-core/libminijail.so
Binary files differ
diff --git a/x86_64/arch-x86-x86_64/shared/vndk-core/libminijail.so b/x86_64/arch-x86-x86_64/shared/vndk-core/libminijail.so
index 888d2ad..75bad80 100755
--- a/x86_64/arch-x86-x86_64/shared/vndk-core/libminijail.so
+++ b/x86_64/arch-x86-x86_64/shared/vndk-core/libminijail.so
Binary files differ
diff --git a/x86_64/arch-x86_64-x86_64/shared/vndk-core/libminijail.so b/x86_64/arch-x86_64-x86_64/shared/vndk-core/libminijail.so
index 53fa22b..7b193fb 100755
--- a/x86_64/arch-x86_64-x86_64/shared/vndk-core/libminijail.so
+++ b/x86_64/arch-x86_64-x86_64/shared/vndk-core/libminijail.so
Binary files differ