Update VNDK snapshot v27 to build 5153436.

Taken from branch oc-mr1-treble-dev.

Test: m -j PRODUCT_EXTRA_VNDK_VERSIONS=27
Change-Id: Ib074b4438036ca799a1d9ec3df5230f305eb9832
diff --git a/arm/Android.bp b/arm/Android.bp
index 3fb0f65..b03aedb 100644
--- a/arm/Android.bp
+++ b/arm/Android.bp
@@ -1338,7 +1338,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libaudioroute-notice",
+    notice: ":vndk-v27-libaudioroute.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libaudioroute.so"],
@@ -1403,7 +1403,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libcap-notice",
+    notice: ":vndk-v27-libcap.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libcap.so"],
@@ -1420,7 +1420,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libcrypto-notice",
+    notice: ":vndk-v27-libcrypto.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libcrypto.so"],
@@ -1453,7 +1453,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libcurl-notice",
+    notice: ":vndk-v27-libcurl.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libcurl.so"],
@@ -1502,7 +1502,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libevent-notice",
+    notice: ":vndk-v27-libevent.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libevent.so"],
@@ -1519,7 +1519,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libexif-notice",
+    notice: ":vndk-v27-libexif.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libexif.so"],
@@ -1536,7 +1536,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libexpat-notice",
+    notice: ":vndk-v27-libexpat.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libexpat.so"],
@@ -1601,7 +1601,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libhardware_legacy-notice",
+    notice: ":vndk-v27-libhardware_legacy.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libhardware_legacy.so"],
@@ -1634,7 +1634,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libkeymaster_messages-notice",
+    notice: ":vndk-v27-libkeymaster_messages.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libkeymaster_messages.so"],
@@ -1651,7 +1651,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libkeymaster_portable-notice",
+    notice: ":vndk-v27-libkeymaster_portable.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libkeymaster_portable.so"],
@@ -1668,7 +1668,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libkeymaster_staging-notice",
+    notice: ":vndk-v27-libkeymaster_staging.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libkeymaster_staging.so"],
@@ -1685,7 +1685,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libldacBT_abr-notice",
+    notice: ":vndk-v27-libldacBT_abr.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libldacBT_abr.so"],
@@ -1702,7 +1702,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libldacBT_enc-notice",
+    notice: ":vndk-v27-libldacBT_enc.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libldacBT_enc.so"],
@@ -1719,7 +1719,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-liblz4-notice",
+    notice: ":vndk-v27-liblz4.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/liblz4.so"],
@@ -1736,7 +1736,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libmedia_helper-notice",
+    notice: ":vndk-v27-libmedia_helper.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libmedia_helper.so"],
@@ -1753,7 +1753,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libmedia_omx-notice",
+    notice: ":vndk-v27-libmedia_omx.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libmedia_omx.so"],
@@ -1786,7 +1786,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libnetutils-notice",
+    notice: ":vndk-v27-libnetutils.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libnetutils.so"],
@@ -1803,7 +1803,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libnl-notice",
+    notice: ":vndk-v27-libnl.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libnl.so"],
@@ -1820,7 +1820,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libopus-notice",
+    notice: ":vndk-v27-libopus.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libopus.so"],
@@ -1837,7 +1837,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libpagemap-notice",
+    notice: ":vndk-v27-libpagemap.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpagemap.so"],
@@ -1854,7 +1854,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libpcre2-notice",
+    notice: ":vndk-v27-libpcre2.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpcre2.so"],
@@ -1871,7 +1871,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libpiex-notice",
+    notice: ":vndk-v27-libpiex.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpiex.so"],
@@ -1904,7 +1904,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libpower-notice",
+    notice: ":vndk-v27-libpower.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpower.so"],
@@ -1937,7 +1937,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libprotobuf-cpp-full-notice",
+    notice: ":vndk-v27-libprotobuf-cpp-full.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libprotobuf-cpp-full.so"],
@@ -1954,7 +1954,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libprotobuf-cpp-lite-notice",
+    notice: ":vndk-v27-libprotobuf-cpp-lite.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libprotobuf-cpp-lite.so"],
@@ -1987,7 +1987,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libsoftkeymasterdevice-notice",
+    notice: ":vndk-v27-libsoftkeymasterdevice.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libsoftkeymasterdevice.so"],
@@ -2004,7 +2004,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libspeexresampler-notice",
+    notice: ":vndk-v27-libspeexresampler.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libspeexresampler.so"],
@@ -2021,7 +2021,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libsqlite-notice",
+    notice: ":vndk-v27-libsqlite.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libsqlite.so"],
@@ -2038,7 +2038,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libssl-notice",
+    notice: ":vndk-v27-libssl.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libssl.so"],
@@ -2055,7 +2055,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_amrnb_common-notice",
+    notice: ":vndk-v27-libstagefright_amrnb_common.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_amrnb_common.so"],
@@ -2072,7 +2072,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_enc_common-notice",
+    notice: ":vndk-v27-libstagefright_enc_common.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_enc_common.so"],
@@ -2089,7 +2089,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_flacdec-notice",
+    notice: ":vndk-v27-libstagefright_flacdec.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_flacdec.so"],
@@ -2106,7 +2106,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_foundation-notice",
+    notice: ":vndk-v27-libstagefright_foundation.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_foundation.so"],
@@ -2123,7 +2123,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_omx-notice",
+    notice: ":vndk-v27-libstagefright_omx.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_omx.so"],
@@ -2140,7 +2140,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_omx_utils-notice",
+    notice: ":vndk-v27-libstagefright_omx_utils.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_omx_utils.so"],
@@ -2157,7 +2157,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_aacdec-notice",
+    notice: ":vndk-v27-libstagefright_soft_aacdec.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_aacdec.so"],
@@ -2174,7 +2174,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_aacenc-notice",
+    notice: ":vndk-v27-libstagefright_soft_aacenc.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_aacenc.so"],
@@ -2191,7 +2191,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_amrdec-notice",
+    notice: ":vndk-v27-libstagefright_soft_amrdec.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_amrdec.so"],
@@ -2208,7 +2208,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_amrnbenc-notice",
+    notice: ":vndk-v27-libstagefright_soft_amrnbenc.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_amrnbenc.so"],
@@ -2225,7 +2225,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_amrwbenc-notice",
+    notice: ":vndk-v27-libstagefright_soft_amrwbenc.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_amrwbenc.so"],
@@ -2274,7 +2274,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_flacdec-notice",
+    notice: ":vndk-v27-libstagefright_soft_flacdec.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_flacdec.so"],
@@ -2291,7 +2291,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_flacenc-notice",
+    notice: ":vndk-v27-libstagefright_soft_flacenc.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_flacenc.so"],
@@ -2308,7 +2308,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_g711dec-notice",
+    notice: ":vndk-v27-libstagefright_soft_g711dec.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_g711dec.so"],
@@ -2325,7 +2325,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_gsmdec-notice",
+    notice: ":vndk-v27-libstagefright_soft_gsmdec.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_gsmdec.so"],
@@ -2358,7 +2358,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_mp3dec-notice",
+    notice: ":vndk-v27-libstagefright_soft_mp3dec.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_mp3dec.so"],
@@ -2391,7 +2391,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_mpeg4dec-notice",
+    notice: ":vndk-v27-libstagefright_soft_mpeg4dec.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_mpeg4dec.so"],
@@ -2408,7 +2408,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_mpeg4enc-notice",
+    notice: ":vndk-v27-libstagefright_soft_mpeg4enc.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_mpeg4enc.so"],
@@ -2441,7 +2441,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_rawdec-notice",
+    notice: ":vndk-v27-libstagefright_soft_rawdec.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_rawdec.so"],
@@ -2458,7 +2458,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_vorbisdec-notice",
+    notice: ":vndk-v27-libstagefright_soft_vorbisdec.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_vorbisdec.so"],
@@ -2475,7 +2475,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_vpxdec-notice",
+    notice: ":vndk-v27-libstagefright_soft_vpxdec.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_vpxdec.so"],
@@ -2492,7 +2492,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_vpxenc-notice",
+    notice: ":vndk-v27-libstagefright_soft_vpxenc.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_vpxenc.so"],
@@ -2557,7 +2557,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libtinyalsa-notice",
+    notice: ":vndk-v27-libtinyalsa.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libtinyalsa.so"],
@@ -2574,7 +2574,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libtinyxml2-notice",
+    notice: ":vndk-v27-libtinyxml2.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libtinyxml2.so"],
@@ -2591,7 +2591,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libui-notice",
+    notice: ":vndk-v27-libui.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libui.so"],
@@ -2656,7 +2656,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libvorbisidec-notice",
+    notice: ":vndk-v27-libvorbisidec.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libvorbisidec.so"],
@@ -2689,7 +2689,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libxml2-notice",
+    notice: ":vndk-v27-libxml2.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libxml2.so"],
@@ -2976,7 +2976,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v27-libblas-notice",
+    notice: ":vndk-v27-libblas.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libblas.so"],
@@ -2994,7 +2994,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v27-libc++-notice",
+    notice: ":vndk-v27-libc++.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libc++.so"],
@@ -3012,7 +3012,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v27-libcompiler_rt-notice",
+    notice: ":vndk-v27-libcompiler_rt.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libcompiler_rt.so"],
@@ -3030,7 +3030,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v27-libcutils-notice",
+    notice: ":vndk-v27-libcutils.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libcutils.so"],
@@ -3048,7 +3048,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v27-libhardware-notice",
+    notice: ":vndk-v27-libhardware.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libhardware.so"],
@@ -3117,7 +3117,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v27-libhwbinder-notice",
+    notice: ":vndk-v27-libhwbinder.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libhwbinder.so"],
@@ -3169,7 +3169,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v27-libunwind-notice",
+    notice: ":vndk-v27-libunwind.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libunwind.so"],
@@ -3187,7 +3187,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v27-libutils-notice",
+    notice: ":vndk-v27-libutils.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libutils.so"],
@@ -3205,7 +3205,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v27-libz-notice",
+    notice: ":vndk-v27-libz.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libz.so"],
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_omx.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_omx.so
index 1e69f99..c92ebc4 100755
--- a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_omx.so
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_omx.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_aacdec.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_aacdec.so
index 8f17a0c..8b715f1 100755
--- a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_aacdec.so
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_aacdec.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_avcdec.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_avcdec.so
index 16d9fa1..0cf09ce 100755
--- a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_avcdec.so
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_avcdec.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_hevcdec.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_hevcdec.so
index 87d764a..e212c9a 100755
--- a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_hevcdec.so
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_hevcdec.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_mpeg2dec.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_mpeg2dec.so
index 7d24134..f2db083 100755
--- a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_mpeg2dec.so
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_mpeg2dec.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libui.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libui.so
index f7f164f..7cded9d 100755
--- a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libui.so
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libui.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libvorbisidec.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libvorbisidec.so
index 8f7fbd7..63ec961 100755
--- a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libvorbisidec.so
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libvorbisidec.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libxml2.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libxml2.so
index 3e6ffae..d2d194d 100755
--- a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libxml2.so
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libxml2.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libcutils.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libcutils.so
index 0fda6ec..f97267a 100755
--- a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libcutils.so
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libcutils.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libhidltransport.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libhidltransport.so
index 4f05cbe..1e409e6 100755
--- a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libhidltransport.so
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libhidltransport.so
Binary files differ
diff --git a/arm64/Android.bp b/arm64/Android.bp
index e7bb750..77e065e 100644
--- a/arm64/Android.bp
+++ b/arm64/Android.bp
@@ -1481,7 +1481,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libaudioroute-notice",
+    notice: ":vndk-v27-libaudioroute.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libaudioroute.so"],
@@ -1554,7 +1554,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libcap-notice",
+    notice: ":vndk-v27-libcap.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libcap.so"],
@@ -1573,7 +1573,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libcrypto-notice",
+    notice: ":vndk-v27-libcrypto.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libcrypto.so"],
@@ -1610,7 +1610,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libcurl-notice",
+    notice: ":vndk-v27-libcurl.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libcurl.so"],
@@ -1665,7 +1665,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libevent-notice",
+    notice: ":vndk-v27-libevent.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libevent.so"],
@@ -1684,7 +1684,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libexif-notice",
+    notice: ":vndk-v27-libexif.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libexif.so"],
@@ -1703,7 +1703,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libexpat-notice",
+    notice: ":vndk-v27-libexpat.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libexpat.so"],
@@ -1776,7 +1776,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libhardware_legacy-notice",
+    notice: ":vndk-v27-libhardware_legacy.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libhardware_legacy.so"],
@@ -1813,7 +1813,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libkeymaster_messages-notice",
+    notice: ":vndk-v27-libkeymaster_messages.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libkeymaster_messages.so"],
@@ -1832,7 +1832,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libkeymaster_portable-notice",
+    notice: ":vndk-v27-libkeymaster_portable.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libkeymaster_portable.so"],
@@ -1851,7 +1851,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libkeymaster_staging-notice",
+    notice: ":vndk-v27-libkeymaster_staging.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libkeymaster_staging.so"],
@@ -1870,7 +1870,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libldacBT_abr-notice",
+    notice: ":vndk-v27-libldacBT_abr.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libldacBT_abr.so"],
@@ -1889,7 +1889,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libldacBT_enc-notice",
+    notice: ":vndk-v27-libldacBT_enc.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libldacBT_enc.so"],
@@ -1908,7 +1908,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-liblz4-notice",
+    notice: ":vndk-v27-liblz4.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/liblz4.so"],
@@ -1927,7 +1927,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libmedia_helper-notice",
+    notice: ":vndk-v27-libmedia_helper.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libmedia_helper.so"],
@@ -1946,7 +1946,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libmedia_omx-notice",
+    notice: ":vndk-v27-libmedia_omx.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libmedia_omx.so"],
@@ -1983,7 +1983,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libnetutils-notice",
+    notice: ":vndk-v27-libnetutils.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libnetutils.so"],
@@ -2002,7 +2002,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libnl-notice",
+    notice: ":vndk-v27-libnl.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libnl.so"],
@@ -2021,7 +2021,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libopus-notice",
+    notice: ":vndk-v27-libopus.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libopus.so"],
@@ -2040,7 +2040,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libpagemap-notice",
+    notice: ":vndk-v27-libpagemap.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpagemap.so"],
@@ -2059,7 +2059,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libpcre2-notice",
+    notice: ":vndk-v27-libpcre2.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpcre2.so"],
@@ -2078,7 +2078,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libpiex-notice",
+    notice: ":vndk-v27-libpiex.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpiex.so"],
@@ -2115,7 +2115,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libpower-notice",
+    notice: ":vndk-v27-libpower.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpower.so"],
@@ -2152,7 +2152,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libprotobuf-cpp-full-notice",
+    notice: ":vndk-v27-libprotobuf-cpp-full.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libprotobuf-cpp-full.so"],
@@ -2171,7 +2171,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libprotobuf-cpp-lite-notice",
+    notice: ":vndk-v27-libprotobuf-cpp-lite.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libprotobuf-cpp-lite.so"],
@@ -2208,7 +2208,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libsoftkeymasterdevice-notice",
+    notice: ":vndk-v27-libsoftkeymasterdevice.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libsoftkeymasterdevice.so"],
@@ -2227,7 +2227,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libspeexresampler-notice",
+    notice: ":vndk-v27-libspeexresampler.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libspeexresampler.so"],
@@ -2246,7 +2246,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libsqlite-notice",
+    notice: ":vndk-v27-libsqlite.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libsqlite.so"],
@@ -2265,7 +2265,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libssl-notice",
+    notice: ":vndk-v27-libssl.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libssl.so"],
@@ -2284,7 +2284,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_amrnb_common-notice",
+    notice: ":vndk-v27-libstagefright_amrnb_common.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_amrnb_common.so"],
@@ -2303,7 +2303,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_enc_common-notice",
+    notice: ":vndk-v27-libstagefright_enc_common.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_enc_common.so"],
@@ -2322,7 +2322,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_flacdec-notice",
+    notice: ":vndk-v27-libstagefright_flacdec.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_flacdec.so"],
@@ -2341,7 +2341,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_foundation-notice",
+    notice: ":vndk-v27-libstagefright_foundation.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_foundation.so"],
@@ -2360,7 +2360,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_omx-notice",
+    notice: ":vndk-v27-libstagefright_omx.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_omx.so"],
@@ -2379,7 +2379,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_omx_utils-notice",
+    notice: ":vndk-v27-libstagefright_omx_utils.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_omx_utils.so"],
@@ -2398,7 +2398,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_aacdec-notice",
+    notice: ":vndk-v27-libstagefright_soft_aacdec.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_aacdec.so"],
@@ -2414,7 +2414,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_aacenc-notice",
+    notice: ":vndk-v27-libstagefright_soft_aacenc.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_aacenc.so"],
@@ -2430,7 +2430,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_amrdec-notice",
+    notice: ":vndk-v27-libstagefright_soft_amrdec.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_amrdec.so"],
@@ -2446,7 +2446,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_amrnbenc-notice",
+    notice: ":vndk-v27-libstagefright_soft_amrnbenc.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_amrnbenc.so"],
@@ -2462,7 +2462,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_amrwbenc-notice",
+    notice: ":vndk-v27-libstagefright_soft_amrwbenc.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_amrwbenc.so"],
@@ -2508,7 +2508,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_flacdec-notice",
+    notice: ":vndk-v27-libstagefright_soft_flacdec.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_flacdec.so"],
@@ -2524,7 +2524,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_flacenc-notice",
+    notice: ":vndk-v27-libstagefright_soft_flacenc.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_flacenc.so"],
@@ -2540,7 +2540,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_g711dec-notice",
+    notice: ":vndk-v27-libstagefright_soft_g711dec.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_g711dec.so"],
@@ -2556,7 +2556,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_gsmdec-notice",
+    notice: ":vndk-v27-libstagefright_soft_gsmdec.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_gsmdec.so"],
@@ -2587,7 +2587,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_mp3dec-notice",
+    notice: ":vndk-v27-libstagefright_soft_mp3dec.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_mp3dec.so"],
@@ -2618,7 +2618,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_mpeg4dec-notice",
+    notice: ":vndk-v27-libstagefright_soft_mpeg4dec.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_mpeg4dec.so"],
@@ -2634,7 +2634,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_mpeg4enc-notice",
+    notice: ":vndk-v27-libstagefright_soft_mpeg4enc.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_mpeg4enc.so"],
@@ -2665,7 +2665,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_rawdec-notice",
+    notice: ":vndk-v27-libstagefright_soft_rawdec.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_rawdec.so"],
@@ -2681,7 +2681,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_vorbisdec-notice",
+    notice: ":vndk-v27-libstagefright_soft_vorbisdec.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_vorbisdec.so"],
@@ -2697,7 +2697,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_vpxdec-notice",
+    notice: ":vndk-v27-libstagefright_soft_vpxdec.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_vpxdec.so"],
@@ -2713,7 +2713,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_vpxenc-notice",
+    notice: ":vndk-v27-libstagefright_soft_vpxenc.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_vpxenc.so"],
@@ -2783,7 +2783,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libtinyalsa-notice",
+    notice: ":vndk-v27-libtinyalsa.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libtinyalsa.so"],
@@ -2802,7 +2802,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libtinyxml2-notice",
+    notice: ":vndk-v27-libtinyxml2.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libtinyxml2.so"],
@@ -2821,7 +2821,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libui-notice",
+    notice: ":vndk-v27-libui.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libui.so"],
@@ -2894,7 +2894,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libvorbisidec-notice",
+    notice: ":vndk-v27-libvorbisidec.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libvorbisidec.so"],
@@ -2931,7 +2931,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libxml2-notice",
+    notice: ":vndk-v27-libxml2.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libxml2.so"],
@@ -3276,7 +3276,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v27-libblas-notice",
+    notice: ":vndk-v27-libblas.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libblas.so"],
@@ -3296,7 +3296,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v27-libc++-notice",
+    notice: ":vndk-v27-libc++.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libc++.so"],
@@ -3316,7 +3316,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v27-libcompiler_rt-notice",
+    notice: ":vndk-v27-libcompiler_rt.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libcompiler_rt.so"],
@@ -3336,7 +3336,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v27-libcutils-notice",
+    notice: ":vndk-v27-libcutils.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libcutils.so"],
@@ -3356,7 +3356,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v27-libhardware-notice",
+    notice: ":vndk-v27-libhardware.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libhardware.so"],
@@ -3433,7 +3433,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v27-libhwbinder-notice",
+    notice: ":vndk-v27-libhwbinder.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libhwbinder.so"],
@@ -3491,7 +3491,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v27-libunwind-notice",
+    notice: ":vndk-v27-libunwind.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libunwind.so"],
@@ -3511,7 +3511,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v27-libutils-notice",
+    notice: ":vndk-v27-libutils.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libutils.so"],
@@ -3531,7 +3531,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v27-libz-notice",
+    notice: ":vndk-v27-libz.so-notice",
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libz.so"],
diff --git a/arm64/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_omx.so b/arm64/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_omx.so
index 260f13a..0a561c0 100755
--- a/arm64/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_omx.so
+++ b/arm64/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_omx.so
Binary files differ
diff --git a/arm64/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_aacdec.so b/arm64/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_aacdec.so
index b8ca84e..341044a 100755
--- a/arm64/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_aacdec.so
+++ b/arm64/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_aacdec.so
Binary files differ
diff --git a/arm64/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_avcdec.so b/arm64/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_avcdec.so
index 45ca663..004efa1 100755
--- a/arm64/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_avcdec.so
+++ b/arm64/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_avcdec.so
Binary files differ
diff --git a/arm64/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_hevcdec.so b/arm64/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_hevcdec.so
index 880f20f..bbdd48a 100755
--- a/arm64/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_hevcdec.so
+++ b/arm64/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_hevcdec.so
Binary files differ
diff --git a/arm64/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_mpeg2dec.so b/arm64/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_mpeg2dec.so
index 70499a9..3dd264f 100755
--- a/arm64/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_mpeg2dec.so
+++ b/arm64/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_mpeg2dec.so
Binary files differ
diff --git a/arm64/arch-arm-armv7-a-neon/shared/vndk-core/libui.so b/arm64/arch-arm-armv7-a-neon/shared/vndk-core/libui.so
index f80af64..cde984c 100755
--- a/arm64/arch-arm-armv7-a-neon/shared/vndk-core/libui.so
+++ b/arm64/arch-arm-armv7-a-neon/shared/vndk-core/libui.so
Binary files differ
diff --git a/arm64/arch-arm-armv7-a-neon/shared/vndk-core/libvorbisidec.so b/arm64/arch-arm-armv7-a-neon/shared/vndk-core/libvorbisidec.so
index d64f355..7120aa7 100755
--- a/arm64/arch-arm-armv7-a-neon/shared/vndk-core/libvorbisidec.so
+++ b/arm64/arch-arm-armv7-a-neon/shared/vndk-core/libvorbisidec.so
Binary files differ
diff --git a/arm64/arch-arm-armv7-a-neon/shared/vndk-core/libxml2.so b/arm64/arch-arm-armv7-a-neon/shared/vndk-core/libxml2.so
index 66a7ded..74a2881 100755
--- a/arm64/arch-arm-armv7-a-neon/shared/vndk-core/libxml2.so
+++ b/arm64/arch-arm-armv7-a-neon/shared/vndk-core/libxml2.so
Binary files differ
diff --git a/arm64/arch-arm-armv7-a-neon/shared/vndk-sp/libcutils.so b/arm64/arch-arm-armv7-a-neon/shared/vndk-sp/libcutils.so
index 04cf935..b0e37d5 100755
--- a/arm64/arch-arm-armv7-a-neon/shared/vndk-sp/libcutils.so
+++ b/arm64/arch-arm-armv7-a-neon/shared/vndk-sp/libcutils.so
Binary files differ
diff --git a/arm64/arch-arm-armv7-a-neon/shared/vndk-sp/libhidltransport.so b/arm64/arch-arm-armv7-a-neon/shared/vndk-sp/libhidltransport.so
index 9d2393d..ed19a16 100755
--- a/arm64/arch-arm-armv7-a-neon/shared/vndk-sp/libhidltransport.so
+++ b/arm64/arch-arm-armv7-a-neon/shared/vndk-sp/libhidltransport.so
Binary files differ
diff --git a/arm64/arch-arm64-armv8-a/shared/vndk-core/libstagefright_omx.so b/arm64/arch-arm64-armv8-a/shared/vndk-core/libstagefright_omx.so
index 6682889..f116272 100755
--- a/arm64/arch-arm64-armv8-a/shared/vndk-core/libstagefright_omx.so
+++ b/arm64/arch-arm64-armv8-a/shared/vndk-core/libstagefright_omx.so
Binary files differ
diff --git a/arm64/arch-arm64-armv8-a/shared/vndk-core/libui.so b/arm64/arch-arm64-armv8-a/shared/vndk-core/libui.so
index 5fa09c3..a827242 100755
--- a/arm64/arch-arm64-armv8-a/shared/vndk-core/libui.so
+++ b/arm64/arch-arm64-armv8-a/shared/vndk-core/libui.so
Binary files differ
diff --git a/arm64/arch-arm64-armv8-a/shared/vndk-core/libvorbisidec.so b/arm64/arch-arm64-armv8-a/shared/vndk-core/libvorbisidec.so
index f27ed7b..5169e82 100755
--- a/arm64/arch-arm64-armv8-a/shared/vndk-core/libvorbisidec.so
+++ b/arm64/arch-arm64-armv8-a/shared/vndk-core/libvorbisidec.so
Binary files differ
diff --git a/arm64/arch-arm64-armv8-a/shared/vndk-core/libxml2.so b/arm64/arch-arm64-armv8-a/shared/vndk-core/libxml2.so
index eafbd0a..e13d1fe 100755
--- a/arm64/arch-arm64-armv8-a/shared/vndk-core/libxml2.so
+++ b/arm64/arch-arm64-armv8-a/shared/vndk-core/libxml2.so
Binary files differ
diff --git a/arm64/arch-arm64-armv8-a/shared/vndk-sp/libcutils.so b/arm64/arch-arm64-armv8-a/shared/vndk-sp/libcutils.so
index a32f654..47033b7 100755
--- a/arm64/arch-arm64-armv8-a/shared/vndk-sp/libcutils.so
+++ b/arm64/arch-arm64-armv8-a/shared/vndk-sp/libcutils.so
Binary files differ
diff --git a/arm64/arch-arm64-armv8-a/shared/vndk-sp/libhidltransport.so b/arm64/arch-arm64-armv8-a/shared/vndk-sp/libhidltransport.so
index a409e8c..385c2fb 100755
--- a/arm64/arch-arm64-armv8-a/shared/vndk-sp/libhidltransport.so
+++ b/arm64/arch-arm64-armv8-a/shared/vndk-sp/libhidltransport.so
Binary files differ
diff --git a/common/Android.bp b/common/Android.bp
index 25e72bb..da01db6 100644
--- a/common/Android.bp
+++ b/common/Android.bp
@@ -1,325 +1,327 @@
+// THIS FILE IS AUTOGENERATED BY development/vndk/snapshot/gen_buildfiles.py
+// DO NOT EDIT
+
 filegroup {
-    name: "vndk-v27-libaudioroute-notice",
-    srcs: ["NOTICE_FILES/libaudioroute.so.txt"],
+    name: "vndk-v27-libz.so-notice",
+    srcs: ["NOTICE_FILES/libz.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v27-libcap-notice",
-    srcs: ["NOTICE_FILES/libcap.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libcrypto-notice",
-    srcs: ["NOTICE_FILES/libcrypto.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libcurl-notice",
-    srcs: ["NOTICE_FILES/libcurl.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libevent-notice",
-    srcs: ["NOTICE_FILES/libevent.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libexif-notice",
-    srcs: ["NOTICE_FILES/libexif.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libexpat-notice",
-    srcs: ["NOTICE_FILES/libexpat.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libhardware_legacy-notice",
-    srcs: ["NOTICE_FILES/libhardware_legacy.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libkeymaster_messages-notice",
-    srcs: ["NOTICE_FILES/libkeymaster_messages.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libkeymaster_portable-notice",
-    srcs: ["NOTICE_FILES/libkeymaster_portable.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libkeymaster_staging-notice",
+    name: "vndk-v27-libkeymaster_staging.so-notice",
     srcs: ["NOTICE_FILES/libkeymaster_staging.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v27-libldacBT_abr-notice",
-    srcs: ["NOTICE_FILES/libldacBT_abr.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libldacBT_enc-notice",
-    srcs: ["NOTICE_FILES/libldacBT_enc.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-liblz4-notice",
-    srcs: ["NOTICE_FILES/liblz4.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libmedia_helper-notice",
-    srcs: ["NOTICE_FILES/libmedia_helper.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libmedia_omx-notice",
-    srcs: ["NOTICE_FILES/libmedia_omx.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libnetutils-notice",
-    srcs: ["NOTICE_FILES/libnetutils.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libnl-notice",
-    srcs: ["NOTICE_FILES/libnl.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libopus-notice",
-    srcs: ["NOTICE_FILES/libopus.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libpagemap-notice",
-    srcs: ["NOTICE_FILES/libpagemap.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libpcre2-notice",
-    srcs: ["NOTICE_FILES/libpcre2.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libpiex-notice",
-    srcs: ["NOTICE_FILES/libpiex.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libpower-notice",
-    srcs: ["NOTICE_FILES/libpower.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libprotobuf-cpp-full-notice",
-    srcs: ["NOTICE_FILES/libprotobuf-cpp-full.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libprotobuf-cpp-lite-notice",
-    srcs: ["NOTICE_FILES/libprotobuf-cpp-lite.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libsoftkeymasterdevice-notice",
-    srcs: ["NOTICE_FILES/libsoftkeymasterdevice.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libspeexresampler-notice",
-    srcs: ["NOTICE_FILES/libspeexresampler.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libsqlite-notice",
-    srcs: ["NOTICE_FILES/libsqlite.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libssl-notice",
-    srcs: ["NOTICE_FILES/libssl.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libstagefright_amrnb_common-notice",
-    srcs: ["NOTICE_FILES/libstagefright_amrnb_common.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libstagefright_enc_common-notice",
-    srcs: ["NOTICE_FILES/libstagefright_enc_common.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libstagefright_flacdec-notice",
-    srcs: ["NOTICE_FILES/libstagefright_flacdec.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libstagefright_foundation-notice",
-    srcs: ["NOTICE_FILES/libstagefright_foundation.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libstagefright_omx-notice",
-    srcs: ["NOTICE_FILES/libstagefright_omx.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libstagefright_omx_utils-notice",
-    srcs: ["NOTICE_FILES/libstagefright_omx_utils.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libstagefright_soft_aacdec-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_aacdec.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libstagefright_soft_aacenc-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_aacenc.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libstagefright_soft_amrdec-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_amrdec.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libstagefright_soft_amrnbenc-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_amrnbenc.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libstagefright_soft_amrwbenc-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_amrwbenc.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libstagefright_soft_flacdec-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_flacdec.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libstagefright_soft_flacenc-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_flacenc.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libstagefright_soft_g711dec-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_g711dec.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libstagefright_soft_gsmdec-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_gsmdec.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libstagefright_soft_mp3dec-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_mp3dec.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libstagefright_soft_mpeg4dec-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_mpeg4dec.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libstagefright_soft_mpeg4enc-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_mpeg4enc.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libstagefright_soft_rawdec-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_rawdec.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libstagefright_soft_vorbisdec-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_vorbisdec.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libstagefright_soft_vpxdec-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_vpxdec.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libstagefright_soft_vpxenc-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_vpxenc.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libtinyalsa-notice",
-    srcs: ["NOTICE_FILES/libtinyalsa.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libtinyxml2-notice",
-    srcs: ["NOTICE_FILES/libtinyxml2.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libui-notice",
-    srcs: ["NOTICE_FILES/libui.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libvorbisidec-notice",
-    srcs: ["NOTICE_FILES/libvorbisidec.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libxml2-notice",
+    name: "vndk-v27-libxml2.so-notice",
     srcs: ["NOTICE_FILES/libxml2.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v27-libblas-notice",
-    srcs: ["NOTICE_FILES/libblas.so.txt"],
+    name: "vndk-v27-libtinyalsa.so-notice",
+    srcs: ["NOTICE_FILES/libtinyalsa.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v27-libc++-notice",
-    srcs: ["NOTICE_FILES/libc++.so.txt"],
+    name: "vndk-v27-libcurl.so-notice",
+    srcs: ["NOTICE_FILES/libcurl.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v27-libcompiler_rt-notice",
-    srcs: ["NOTICE_FILES/libcompiler_rt.so.txt"],
+    name: "vndk-v27-libmedia_helper.so-notice",
+    srcs: ["NOTICE_FILES/libmedia_helper.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v27-libcutils-notice",
-    srcs: ["NOTICE_FILES/libcutils.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libhardware-notice",
-    srcs: ["NOTICE_FILES/libhardware.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libhwbinder-notice",
-    srcs: ["NOTICE_FILES/libhwbinder.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libunwind-notice",
-    srcs: ["NOTICE_FILES/libunwind.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v27-libutils-notice",
+    name: "vndk-v27-libutils.so-notice",
     srcs: ["NOTICE_FILES/libutils.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v27-libz-notice",
-    srcs: ["NOTICE_FILES/libz.so.txt"],
+    name: "vndk-v27-libstagefright_enc_common.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_enc_common.so.txt"],
 }
 
+filegroup {
+    name: "vndk-v27-libstagefright_foundation.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_foundation.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libpcre2.so-notice",
+    srcs: ["NOTICE_FILES/libpcre2.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libui.so-notice",
+    srcs: ["NOTICE_FILES/libui.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libstagefright_soft_flacenc.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_soft_flacenc.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libkeymaster_messages.so-notice",
+    srcs: ["NOTICE_FILES/libkeymaster_messages.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libstagefright_soft_g711dec.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_soft_g711dec.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libnetutils.so-notice",
+    srcs: ["NOTICE_FILES/libnetutils.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libldacBT_abr.so-notice",
+    srcs: ["NOTICE_FILES/libldacBT_abr.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libaudioroute.so-notice",
+    srcs: ["NOTICE_FILES/libaudioroute.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libstagefright_soft_flacdec.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_soft_flacdec.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libstagefright_omx_utils.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_omx_utils.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libcutils.so-notice",
+    srcs: ["NOTICE_FILES/libcutils.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libstagefright_soft_amrdec.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_soft_amrdec.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libpower.so-notice",
+    srcs: ["NOTICE_FILES/libpower.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libstagefright_soft_amrwbenc.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_soft_amrwbenc.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libnl.so-notice",
+    srcs: ["NOTICE_FILES/libnl.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libstagefright_soft_mpeg4dec.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_soft_mpeg4dec.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libsoftkeymasterdevice.so-notice",
+    srcs: ["NOTICE_FILES/libsoftkeymasterdevice.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libstagefright_soft_amrnbenc.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_soft_amrnbenc.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libprotobuf-cpp-lite.so-notice",
+    srcs: ["NOTICE_FILES/libprotobuf-cpp-lite.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libcompiler_rt.so-notice",
+    srcs: ["NOTICE_FILES/libcompiler_rt.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libstagefright_soft_aacdec.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_soft_aacdec.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libhardware.so-notice",
+    srcs: ["NOTICE_FILES/libhardware.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libstagefright_soft_vpxdec.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_soft_vpxdec.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libmedia_omx.so-notice",
+    srcs: ["NOTICE_FILES/libmedia_omx.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libblas.so-notice",
+    srcs: ["NOTICE_FILES/libblas.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libspeexresampler.so-notice",
+    srcs: ["NOTICE_FILES/libspeexresampler.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libsqlite.so-notice",
+    srcs: ["NOTICE_FILES/libsqlite.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-liblz4.so-notice",
+    srcs: ["NOTICE_FILES/liblz4.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libstagefright_soft_aacenc.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_soft_aacenc.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libopus.so-notice",
+    srcs: ["NOTICE_FILES/libopus.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libevent.so-notice",
+    srcs: ["NOTICE_FILES/libevent.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libstagefright_soft_rawdec.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_soft_rawdec.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libprotobuf-cpp-full.so-notice",
+    srcs: ["NOTICE_FILES/libprotobuf-cpp-full.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libunwind.so-notice",
+    srcs: ["NOTICE_FILES/libunwind.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libpagemap.so-notice",
+    srcs: ["NOTICE_FILES/libpagemap.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libldacBT_enc.so-notice",
+    srcs: ["NOTICE_FILES/libldacBT_enc.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libpiex.so-notice",
+    srcs: ["NOTICE_FILES/libpiex.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libstagefright_soft_vpxenc.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_soft_vpxenc.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libstagefright_soft_gsmdec.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_soft_gsmdec.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libexpat.so-notice",
+    srcs: ["NOTICE_FILES/libexpat.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libcrypto.so-notice",
+    srcs: ["NOTICE_FILES/libcrypto.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libexif.so-notice",
+    srcs: ["NOTICE_FILES/libexif.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libstagefright_soft_mp3dec.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_soft_mp3dec.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libhardware_legacy.so-notice",
+    srcs: ["NOTICE_FILES/libhardware_legacy.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libstagefright_omx.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_omx.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libstagefright_soft_mpeg4enc.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_soft_mpeg4enc.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libstagefright_amrnb_common.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_amrnb_common.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libssl.so-notice",
+    srcs: ["NOTICE_FILES/libssl.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libc++.so-notice",
+    srcs: ["NOTICE_FILES/libc++.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libstagefright_flacdec.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_flacdec.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libcap.so-notice",
+    srcs: ["NOTICE_FILES/libcap.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libhwbinder.so-notice",
+    srcs: ["NOTICE_FILES/libhwbinder.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libtinyxml2.so-notice",
+    srcs: ["NOTICE_FILES/libtinyxml2.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libstagefright_soft_vorbisdec.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_soft_vorbisdec.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libkeymaster_portable.so-notice",
+    srcs: ["NOTICE_FILES/libkeymaster_portable.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v27-libvorbisidec.so-notice",
+    srcs: ["NOTICE_FILES/libvorbisidec.so.txt"],
+}
diff --git a/x86/Android.bp b/x86/Android.bp
index 0ca09e6..c41d6b0 100644
--- a/x86/Android.bp
+++ b/x86/Android.bp
@@ -1338,7 +1338,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libaudioroute-notice",
+    notice: ":vndk-v27-libaudioroute.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libaudioroute.so"],
@@ -1403,7 +1403,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libcap-notice",
+    notice: ":vndk-v27-libcap.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libcap.so"],
@@ -1420,7 +1420,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libcrypto-notice",
+    notice: ":vndk-v27-libcrypto.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libcrypto.so"],
@@ -1453,7 +1453,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libcurl-notice",
+    notice: ":vndk-v27-libcurl.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libcurl.so"],
@@ -1502,7 +1502,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libevent-notice",
+    notice: ":vndk-v27-libevent.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libevent.so"],
@@ -1519,7 +1519,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libexif-notice",
+    notice: ":vndk-v27-libexif.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libexif.so"],
@@ -1536,7 +1536,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libexpat-notice",
+    notice: ":vndk-v27-libexpat.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libexpat.so"],
@@ -1601,7 +1601,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libhardware_legacy-notice",
+    notice: ":vndk-v27-libhardware_legacy.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libhardware_legacy.so"],
@@ -1634,7 +1634,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libkeymaster_messages-notice",
+    notice: ":vndk-v27-libkeymaster_messages.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libkeymaster_messages.so"],
@@ -1651,7 +1651,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libkeymaster_portable-notice",
+    notice: ":vndk-v27-libkeymaster_portable.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libkeymaster_portable.so"],
@@ -1668,7 +1668,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libkeymaster_staging-notice",
+    notice: ":vndk-v27-libkeymaster_staging.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libkeymaster_staging.so"],
@@ -1685,7 +1685,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libldacBT_abr-notice",
+    notice: ":vndk-v27-libldacBT_abr.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libldacBT_abr.so"],
@@ -1702,7 +1702,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libldacBT_enc-notice",
+    notice: ":vndk-v27-libldacBT_enc.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libldacBT_enc.so"],
@@ -1719,7 +1719,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-liblz4-notice",
+    notice: ":vndk-v27-liblz4.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/liblz4.so"],
@@ -1736,7 +1736,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libmedia_helper-notice",
+    notice: ":vndk-v27-libmedia_helper.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libmedia_helper.so"],
@@ -1753,7 +1753,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libmedia_omx-notice",
+    notice: ":vndk-v27-libmedia_omx.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libmedia_omx.so"],
@@ -1786,7 +1786,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libnetutils-notice",
+    notice: ":vndk-v27-libnetutils.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libnetutils.so"],
@@ -1803,7 +1803,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libnl-notice",
+    notice: ":vndk-v27-libnl.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libnl.so"],
@@ -1820,7 +1820,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libopus-notice",
+    notice: ":vndk-v27-libopus.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libopus.so"],
@@ -1837,7 +1837,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libpagemap-notice",
+    notice: ":vndk-v27-libpagemap.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libpagemap.so"],
@@ -1854,7 +1854,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libpcre2-notice",
+    notice: ":vndk-v27-libpcre2.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libpcre2.so"],
@@ -1871,7 +1871,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libpiex-notice",
+    notice: ":vndk-v27-libpiex.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libpiex.so"],
@@ -1904,7 +1904,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libpower-notice",
+    notice: ":vndk-v27-libpower.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libpower.so"],
@@ -1937,7 +1937,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libprotobuf-cpp-full-notice",
+    notice: ":vndk-v27-libprotobuf-cpp-full.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libprotobuf-cpp-full.so"],
@@ -1954,7 +1954,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libprotobuf-cpp-lite-notice",
+    notice: ":vndk-v27-libprotobuf-cpp-lite.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libprotobuf-cpp-lite.so"],
@@ -1987,7 +1987,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libsoftkeymasterdevice-notice",
+    notice: ":vndk-v27-libsoftkeymasterdevice.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libsoftkeymasterdevice.so"],
@@ -2004,7 +2004,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libspeexresampler-notice",
+    notice: ":vndk-v27-libspeexresampler.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libspeexresampler.so"],
@@ -2021,7 +2021,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libsqlite-notice",
+    notice: ":vndk-v27-libsqlite.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libsqlite.so"],
@@ -2038,7 +2038,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libssl-notice",
+    notice: ":vndk-v27-libssl.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libssl.so"],
@@ -2055,7 +2055,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_amrnb_common-notice",
+    notice: ":vndk-v27-libstagefright_amrnb_common.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_amrnb_common.so"],
@@ -2072,7 +2072,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_enc_common-notice",
+    notice: ":vndk-v27-libstagefright_enc_common.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_enc_common.so"],
@@ -2089,7 +2089,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_flacdec-notice",
+    notice: ":vndk-v27-libstagefright_flacdec.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_flacdec.so"],
@@ -2106,7 +2106,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_foundation-notice",
+    notice: ":vndk-v27-libstagefright_foundation.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_foundation.so"],
@@ -2123,7 +2123,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_omx-notice",
+    notice: ":vndk-v27-libstagefright_omx.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_omx.so"],
@@ -2140,7 +2140,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_omx_utils-notice",
+    notice: ":vndk-v27-libstagefright_omx_utils.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_omx_utils.so"],
@@ -2157,7 +2157,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_aacdec-notice",
+    notice: ":vndk-v27-libstagefright_soft_aacdec.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_aacdec.so"],
@@ -2174,7 +2174,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_aacenc-notice",
+    notice: ":vndk-v27-libstagefright_soft_aacenc.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_aacenc.so"],
@@ -2191,7 +2191,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_amrdec-notice",
+    notice: ":vndk-v27-libstagefright_soft_amrdec.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_amrdec.so"],
@@ -2208,7 +2208,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_amrnbenc-notice",
+    notice: ":vndk-v27-libstagefright_soft_amrnbenc.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_amrnbenc.so"],
@@ -2225,7 +2225,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_amrwbenc-notice",
+    notice: ":vndk-v27-libstagefright_soft_amrwbenc.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_amrwbenc.so"],
@@ -2274,7 +2274,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_flacdec-notice",
+    notice: ":vndk-v27-libstagefright_soft_flacdec.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_flacdec.so"],
@@ -2291,7 +2291,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_flacenc-notice",
+    notice: ":vndk-v27-libstagefright_soft_flacenc.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_flacenc.so"],
@@ -2308,7 +2308,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_g711dec-notice",
+    notice: ":vndk-v27-libstagefright_soft_g711dec.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_g711dec.so"],
@@ -2325,7 +2325,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_gsmdec-notice",
+    notice: ":vndk-v27-libstagefright_soft_gsmdec.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_gsmdec.so"],
@@ -2358,7 +2358,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_mp3dec-notice",
+    notice: ":vndk-v27-libstagefright_soft_mp3dec.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_mp3dec.so"],
@@ -2391,7 +2391,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_mpeg4dec-notice",
+    notice: ":vndk-v27-libstagefright_soft_mpeg4dec.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_mpeg4dec.so"],
@@ -2408,7 +2408,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_mpeg4enc-notice",
+    notice: ":vndk-v27-libstagefright_soft_mpeg4enc.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_mpeg4enc.so"],
@@ -2441,7 +2441,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_rawdec-notice",
+    notice: ":vndk-v27-libstagefright_soft_rawdec.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_rawdec.so"],
@@ -2458,7 +2458,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_vorbisdec-notice",
+    notice: ":vndk-v27-libstagefright_soft_vorbisdec.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_vorbisdec.so"],
@@ -2475,7 +2475,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_vpxdec-notice",
+    notice: ":vndk-v27-libstagefright_soft_vpxdec.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_vpxdec.so"],
@@ -2492,7 +2492,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_vpxenc-notice",
+    notice: ":vndk-v27-libstagefright_soft_vpxenc.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_vpxenc.so"],
@@ -2557,7 +2557,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libtinyalsa-notice",
+    notice: ":vndk-v27-libtinyalsa.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libtinyalsa.so"],
@@ -2574,7 +2574,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libtinyxml2-notice",
+    notice: ":vndk-v27-libtinyxml2.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libtinyxml2.so"],
@@ -2591,7 +2591,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libui-notice",
+    notice: ":vndk-v27-libui.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libui.so"],
@@ -2656,7 +2656,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libvorbisidec-notice",
+    notice: ":vndk-v27-libvorbisidec.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libvorbisidec.so"],
@@ -2689,7 +2689,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libxml2-notice",
+    notice: ":vndk-v27-libxml2.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libxml2.so"],
@@ -2976,7 +2976,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v27-libblas-notice",
+    notice: ":vndk-v27-libblas.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libblas.so"],
@@ -2994,7 +2994,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v27-libc++-notice",
+    notice: ":vndk-v27-libc++.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libc++.so"],
@@ -3012,7 +3012,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v27-libcompiler_rt-notice",
+    notice: ":vndk-v27-libcompiler_rt.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libcompiler_rt.so"],
@@ -3030,7 +3030,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v27-libcutils-notice",
+    notice: ":vndk-v27-libcutils.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libcutils.so"],
@@ -3048,7 +3048,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v27-libhardware-notice",
+    notice: ":vndk-v27-libhardware.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libhardware.so"],
@@ -3117,7 +3117,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v27-libhwbinder-notice",
+    notice: ":vndk-v27-libhwbinder.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libhwbinder.so"],
@@ -3169,7 +3169,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v27-libunwind-notice",
+    notice: ":vndk-v27-libunwind.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libunwind.so"],
@@ -3187,7 +3187,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v27-libutils-notice",
+    notice: ":vndk-v27-libutils.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libutils.so"],
@@ -3205,7 +3205,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v27-libz-notice",
+    notice: ":vndk-v27-libz.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libz.so"],
diff --git a/x86/arch-x86-x86/shared/vndk-core/libstagefright_omx.so b/x86/arch-x86-x86/shared/vndk-core/libstagefright_omx.so
index 9eab2a0..87f0804 100755
--- a/x86/arch-x86-x86/shared/vndk-core/libstagefright_omx.so
+++ b/x86/arch-x86-x86/shared/vndk-core/libstagefright_omx.so
Binary files differ
diff --git a/x86/arch-x86-x86/shared/vndk-core/libstagefright_soft_aacdec.so b/x86/arch-x86-x86/shared/vndk-core/libstagefright_soft_aacdec.so
index ebd17cc..4f96e99 100755
--- a/x86/arch-x86-x86/shared/vndk-core/libstagefright_soft_aacdec.so
+++ b/x86/arch-x86-x86/shared/vndk-core/libstagefright_soft_aacdec.so
Binary files differ
diff --git a/x86/arch-x86-x86/shared/vndk-core/libstagefright_soft_avcdec.so b/x86/arch-x86-x86/shared/vndk-core/libstagefright_soft_avcdec.so
index 0b4a2e6..7da470f 100755
--- a/x86/arch-x86-x86/shared/vndk-core/libstagefright_soft_avcdec.so
+++ b/x86/arch-x86-x86/shared/vndk-core/libstagefright_soft_avcdec.so
Binary files differ
diff --git a/x86/arch-x86-x86/shared/vndk-core/libstagefright_soft_hevcdec.so b/x86/arch-x86-x86/shared/vndk-core/libstagefright_soft_hevcdec.so
index f9d4ea8..a6a1cd9 100755
--- a/x86/arch-x86-x86/shared/vndk-core/libstagefright_soft_hevcdec.so
+++ b/x86/arch-x86-x86/shared/vndk-core/libstagefright_soft_hevcdec.so
Binary files differ
diff --git a/x86/arch-x86-x86/shared/vndk-core/libstagefright_soft_mpeg2dec.so b/x86/arch-x86-x86/shared/vndk-core/libstagefright_soft_mpeg2dec.so
index cae995e..199997a 100755
--- a/x86/arch-x86-x86/shared/vndk-core/libstagefright_soft_mpeg2dec.so
+++ b/x86/arch-x86-x86/shared/vndk-core/libstagefright_soft_mpeg2dec.so
Binary files differ
diff --git a/x86/arch-x86-x86/shared/vndk-core/libui.so b/x86/arch-x86-x86/shared/vndk-core/libui.so
index e743052..daaf331 100755
--- a/x86/arch-x86-x86/shared/vndk-core/libui.so
+++ b/x86/arch-x86-x86/shared/vndk-core/libui.so
Binary files differ
diff --git a/x86/arch-x86-x86/shared/vndk-core/libvorbisidec.so b/x86/arch-x86-x86/shared/vndk-core/libvorbisidec.so
index 17fc03b..5eab347 100755
--- a/x86/arch-x86-x86/shared/vndk-core/libvorbisidec.so
+++ b/x86/arch-x86-x86/shared/vndk-core/libvorbisidec.so
Binary files differ
diff --git a/x86/arch-x86-x86/shared/vndk-core/libxml2.so b/x86/arch-x86-x86/shared/vndk-core/libxml2.so
index bfe4844..6d2d59b 100755
--- a/x86/arch-x86-x86/shared/vndk-core/libxml2.so
+++ b/x86/arch-x86-x86/shared/vndk-core/libxml2.so
Binary files differ
diff --git a/x86/arch-x86-x86/shared/vndk-sp/libcutils.so b/x86/arch-x86-x86/shared/vndk-sp/libcutils.so
index 81ad528..f5660fd 100755
--- a/x86/arch-x86-x86/shared/vndk-sp/libcutils.so
+++ b/x86/arch-x86-x86/shared/vndk-sp/libcutils.so
Binary files differ
diff --git a/x86/arch-x86-x86/shared/vndk-sp/libhidltransport.so b/x86/arch-x86-x86/shared/vndk-sp/libhidltransport.so
index dba77ae..a9d4da5 100755
--- a/x86/arch-x86-x86/shared/vndk-sp/libhidltransport.so
+++ b/x86/arch-x86-x86/shared/vndk-sp/libhidltransport.so
Binary files differ
diff --git a/x86_64/Android.bp b/x86_64/Android.bp
index 7830f0f..3d0d66c 100644
--- a/x86_64/Android.bp
+++ b/x86_64/Android.bp
@@ -1481,7 +1481,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libaudioroute-notice",
+    notice: ":vndk-v27-libaudioroute.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libaudioroute.so"],
@@ -1554,7 +1554,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libcap-notice",
+    notice: ":vndk-v27-libcap.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libcap.so"],
@@ -1573,7 +1573,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libcrypto-notice",
+    notice: ":vndk-v27-libcrypto.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libcrypto.so"],
@@ -1610,7 +1610,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libcurl-notice",
+    notice: ":vndk-v27-libcurl.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libcurl.so"],
@@ -1665,7 +1665,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libevent-notice",
+    notice: ":vndk-v27-libevent.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libevent.so"],
@@ -1684,7 +1684,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libexif-notice",
+    notice: ":vndk-v27-libexif.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libexif.so"],
@@ -1703,7 +1703,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libexpat-notice",
+    notice: ":vndk-v27-libexpat.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libexpat.so"],
@@ -1776,7 +1776,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libhardware_legacy-notice",
+    notice: ":vndk-v27-libhardware_legacy.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libhardware_legacy.so"],
@@ -1813,7 +1813,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libkeymaster_messages-notice",
+    notice: ":vndk-v27-libkeymaster_messages.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libkeymaster_messages.so"],
@@ -1832,7 +1832,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libkeymaster_portable-notice",
+    notice: ":vndk-v27-libkeymaster_portable.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libkeymaster_portable.so"],
@@ -1851,7 +1851,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libkeymaster_staging-notice",
+    notice: ":vndk-v27-libkeymaster_staging.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libkeymaster_staging.so"],
@@ -1870,7 +1870,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libldacBT_abr-notice",
+    notice: ":vndk-v27-libldacBT_abr.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libldacBT_abr.so"],
@@ -1889,7 +1889,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libldacBT_enc-notice",
+    notice: ":vndk-v27-libldacBT_enc.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libldacBT_enc.so"],
@@ -1908,7 +1908,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-liblz4-notice",
+    notice: ":vndk-v27-liblz4.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/liblz4.so"],
@@ -1927,7 +1927,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libmedia_helper-notice",
+    notice: ":vndk-v27-libmedia_helper.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libmedia_helper.so"],
@@ -1946,7 +1946,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libmedia_omx-notice",
+    notice: ":vndk-v27-libmedia_omx.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libmedia_omx.so"],
@@ -1983,7 +1983,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libnetutils-notice",
+    notice: ":vndk-v27-libnetutils.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libnetutils.so"],
@@ -2002,7 +2002,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libnl-notice",
+    notice: ":vndk-v27-libnl.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libnl.so"],
@@ -2021,7 +2021,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libopus-notice",
+    notice: ":vndk-v27-libopus.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libopus.so"],
@@ -2040,7 +2040,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libpagemap-notice",
+    notice: ":vndk-v27-libpagemap.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libpagemap.so"],
@@ -2059,7 +2059,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libpcre2-notice",
+    notice: ":vndk-v27-libpcre2.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libpcre2.so"],
@@ -2078,7 +2078,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libpiex-notice",
+    notice: ":vndk-v27-libpiex.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libpiex.so"],
@@ -2115,7 +2115,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libpower-notice",
+    notice: ":vndk-v27-libpower.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libpower.so"],
@@ -2152,7 +2152,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libprotobuf-cpp-full-notice",
+    notice: ":vndk-v27-libprotobuf-cpp-full.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libprotobuf-cpp-full.so"],
@@ -2171,7 +2171,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libprotobuf-cpp-lite-notice",
+    notice: ":vndk-v27-libprotobuf-cpp-lite.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libprotobuf-cpp-lite.so"],
@@ -2208,7 +2208,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libsoftkeymasterdevice-notice",
+    notice: ":vndk-v27-libsoftkeymasterdevice.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libsoftkeymasterdevice.so"],
@@ -2227,7 +2227,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libspeexresampler-notice",
+    notice: ":vndk-v27-libspeexresampler.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libspeexresampler.so"],
@@ -2246,7 +2246,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libsqlite-notice",
+    notice: ":vndk-v27-libsqlite.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libsqlite.so"],
@@ -2265,7 +2265,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libssl-notice",
+    notice: ":vndk-v27-libssl.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libssl.so"],
@@ -2284,7 +2284,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_amrnb_common-notice",
+    notice: ":vndk-v27-libstagefright_amrnb_common.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_amrnb_common.so"],
@@ -2303,7 +2303,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_enc_common-notice",
+    notice: ":vndk-v27-libstagefright_enc_common.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_enc_common.so"],
@@ -2322,7 +2322,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_flacdec-notice",
+    notice: ":vndk-v27-libstagefright_flacdec.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_flacdec.so"],
@@ -2341,7 +2341,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_foundation-notice",
+    notice: ":vndk-v27-libstagefright_foundation.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_foundation.so"],
@@ -2360,7 +2360,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_omx-notice",
+    notice: ":vndk-v27-libstagefright_omx.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_omx.so"],
@@ -2379,7 +2379,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_omx_utils-notice",
+    notice: ":vndk-v27-libstagefright_omx_utils.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_omx_utils.so"],
@@ -2398,7 +2398,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_aacdec-notice",
+    notice: ":vndk-v27-libstagefright_soft_aacdec.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_soft_aacdec.so"],
@@ -2414,7 +2414,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_aacenc-notice",
+    notice: ":vndk-v27-libstagefright_soft_aacenc.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_soft_aacenc.so"],
@@ -2430,7 +2430,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_amrdec-notice",
+    notice: ":vndk-v27-libstagefright_soft_amrdec.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_soft_amrdec.so"],
@@ -2446,7 +2446,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_amrnbenc-notice",
+    notice: ":vndk-v27-libstagefright_soft_amrnbenc.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_soft_amrnbenc.so"],
@@ -2462,7 +2462,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_amrwbenc-notice",
+    notice: ":vndk-v27-libstagefright_soft_amrwbenc.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_soft_amrwbenc.so"],
@@ -2508,7 +2508,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_flacdec-notice",
+    notice: ":vndk-v27-libstagefright_soft_flacdec.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_soft_flacdec.so"],
@@ -2524,7 +2524,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_flacenc-notice",
+    notice: ":vndk-v27-libstagefright_soft_flacenc.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_soft_flacenc.so"],
@@ -2540,7 +2540,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_g711dec-notice",
+    notice: ":vndk-v27-libstagefright_soft_g711dec.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_soft_g711dec.so"],
@@ -2556,7 +2556,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_gsmdec-notice",
+    notice: ":vndk-v27-libstagefright_soft_gsmdec.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_soft_gsmdec.so"],
@@ -2587,7 +2587,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_mp3dec-notice",
+    notice: ":vndk-v27-libstagefright_soft_mp3dec.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_soft_mp3dec.so"],
@@ -2618,7 +2618,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_mpeg4dec-notice",
+    notice: ":vndk-v27-libstagefright_soft_mpeg4dec.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_soft_mpeg4dec.so"],
@@ -2634,7 +2634,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_mpeg4enc-notice",
+    notice: ":vndk-v27-libstagefright_soft_mpeg4enc.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_soft_mpeg4enc.so"],
@@ -2665,7 +2665,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_rawdec-notice",
+    notice: ":vndk-v27-libstagefright_soft_rawdec.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_soft_rawdec.so"],
@@ -2681,7 +2681,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_vorbisdec-notice",
+    notice: ":vndk-v27-libstagefright_soft_vorbisdec.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_soft_vorbisdec.so"],
@@ -2697,7 +2697,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_vpxdec-notice",
+    notice: ":vndk-v27-libstagefright_soft_vpxdec.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_soft_vpxdec.so"],
@@ -2713,7 +2713,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libstagefright_soft_vpxenc-notice",
+    notice: ":vndk-v27-libstagefright_soft_vpxenc.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_soft_vpxenc.so"],
@@ -2783,7 +2783,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libtinyalsa-notice",
+    notice: ":vndk-v27-libtinyalsa.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libtinyalsa.so"],
@@ -2802,7 +2802,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libtinyxml2-notice",
+    notice: ":vndk-v27-libtinyxml2.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libtinyxml2.so"],
@@ -2821,7 +2821,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libui-notice",
+    notice: ":vndk-v27-libui.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libui.so"],
@@ -2894,7 +2894,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libvorbisidec-notice",
+    notice: ":vndk-v27-libvorbisidec.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libvorbisidec.so"],
@@ -2931,7 +2931,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v27-libxml2-notice",
+    notice: ":vndk-v27-libxml2.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libxml2.so"],
@@ -3276,7 +3276,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v27-libblas-notice",
+    notice: ":vndk-v27-libblas.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libblas.so"],
@@ -3296,7 +3296,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v27-libc++-notice",
+    notice: ":vndk-v27-libc++.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libc++.so"],
@@ -3316,7 +3316,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v27-libcompiler_rt-notice",
+    notice: ":vndk-v27-libcompiler_rt.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libcompiler_rt.so"],
@@ -3336,7 +3336,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v27-libcutils-notice",
+    notice: ":vndk-v27-libcutils.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libcutils.so"],
@@ -3356,7 +3356,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v27-libhardware-notice",
+    notice: ":vndk-v27-libhardware.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libhardware.so"],
@@ -3433,7 +3433,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v27-libhwbinder-notice",
+    notice: ":vndk-v27-libhwbinder.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libhwbinder.so"],
@@ -3491,7 +3491,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v27-libunwind-notice",
+    notice: ":vndk-v27-libunwind.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libunwind.so"],
@@ -3511,7 +3511,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v27-libutils-notice",
+    notice: ":vndk-v27-libutils.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libutils.so"],
@@ -3531,7 +3531,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v27-libz-notice",
+    notice: ":vndk-v27-libz.so-notice",
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libz.so"],
diff --git a/x86_64/arch-x86-x86_64/shared/vndk-core/libstagefright_omx.so b/x86_64/arch-x86-x86_64/shared/vndk-core/libstagefright_omx.so
index 5425772..794bfbd 100755
--- a/x86_64/arch-x86-x86_64/shared/vndk-core/libstagefright_omx.so
+++ b/x86_64/arch-x86-x86_64/shared/vndk-core/libstagefright_omx.so
Binary files differ
diff --git a/x86_64/arch-x86-x86_64/shared/vndk-core/libstagefright_soft_aacdec.so b/x86_64/arch-x86-x86_64/shared/vndk-core/libstagefright_soft_aacdec.so
index 4039bfa..e576529 100755
--- a/x86_64/arch-x86-x86_64/shared/vndk-core/libstagefright_soft_aacdec.so
+++ b/x86_64/arch-x86-x86_64/shared/vndk-core/libstagefright_soft_aacdec.so
Binary files differ
diff --git a/x86_64/arch-x86-x86_64/shared/vndk-core/libstagefright_soft_avcdec.so b/x86_64/arch-x86-x86_64/shared/vndk-core/libstagefright_soft_avcdec.so
index 798176d..fe1bcaa 100755
--- a/x86_64/arch-x86-x86_64/shared/vndk-core/libstagefright_soft_avcdec.so
+++ b/x86_64/arch-x86-x86_64/shared/vndk-core/libstagefright_soft_avcdec.so
Binary files differ
diff --git a/x86_64/arch-x86-x86_64/shared/vndk-core/libstagefright_soft_hevcdec.so b/x86_64/arch-x86-x86_64/shared/vndk-core/libstagefright_soft_hevcdec.so
index 9d16b75..3ac29b2 100755
--- a/x86_64/arch-x86-x86_64/shared/vndk-core/libstagefright_soft_hevcdec.so
+++ b/x86_64/arch-x86-x86_64/shared/vndk-core/libstagefright_soft_hevcdec.so
Binary files differ
diff --git a/x86_64/arch-x86-x86_64/shared/vndk-core/libstagefright_soft_mpeg2dec.so b/x86_64/arch-x86-x86_64/shared/vndk-core/libstagefright_soft_mpeg2dec.so
index e0248c6..9ed889b 100755
--- a/x86_64/arch-x86-x86_64/shared/vndk-core/libstagefright_soft_mpeg2dec.so
+++ b/x86_64/arch-x86-x86_64/shared/vndk-core/libstagefright_soft_mpeg2dec.so
Binary files differ
diff --git a/x86_64/arch-x86-x86_64/shared/vndk-core/libui.so b/x86_64/arch-x86-x86_64/shared/vndk-core/libui.so
index 3bbaf9c..6af877c 100755
--- a/x86_64/arch-x86-x86_64/shared/vndk-core/libui.so
+++ b/x86_64/arch-x86-x86_64/shared/vndk-core/libui.so
Binary files differ
diff --git a/x86_64/arch-x86-x86_64/shared/vndk-core/libvorbisidec.so b/x86_64/arch-x86-x86_64/shared/vndk-core/libvorbisidec.so
index 2c1fa2c..d906b45 100755
--- a/x86_64/arch-x86-x86_64/shared/vndk-core/libvorbisidec.so
+++ b/x86_64/arch-x86-x86_64/shared/vndk-core/libvorbisidec.so
Binary files differ
diff --git a/x86_64/arch-x86-x86_64/shared/vndk-core/libxml2.so b/x86_64/arch-x86-x86_64/shared/vndk-core/libxml2.so
index 2367899..d443830 100755
--- a/x86_64/arch-x86-x86_64/shared/vndk-core/libxml2.so
+++ b/x86_64/arch-x86-x86_64/shared/vndk-core/libxml2.so
Binary files differ
diff --git a/x86_64/arch-x86-x86_64/shared/vndk-sp/libcutils.so b/x86_64/arch-x86-x86_64/shared/vndk-sp/libcutils.so
index 66e63a6..977fe4c 100755
--- a/x86_64/arch-x86-x86_64/shared/vndk-sp/libcutils.so
+++ b/x86_64/arch-x86-x86_64/shared/vndk-sp/libcutils.so
Binary files differ
diff --git a/x86_64/arch-x86-x86_64/shared/vndk-sp/libhidltransport.so b/x86_64/arch-x86-x86_64/shared/vndk-sp/libhidltransport.so
index d172581..838644c 100755
--- a/x86_64/arch-x86-x86_64/shared/vndk-sp/libhidltransport.so
+++ b/x86_64/arch-x86-x86_64/shared/vndk-sp/libhidltransport.so
Binary files differ
diff --git a/x86_64/arch-x86_64-x86_64/shared/vndk-core/libstagefright_omx.so b/x86_64/arch-x86_64-x86_64/shared/vndk-core/libstagefright_omx.so
index 0efde3d..a3097ab 100755
--- a/x86_64/arch-x86_64-x86_64/shared/vndk-core/libstagefright_omx.so
+++ b/x86_64/arch-x86_64-x86_64/shared/vndk-core/libstagefright_omx.so
Binary files differ
diff --git a/x86_64/arch-x86_64-x86_64/shared/vndk-core/libui.so b/x86_64/arch-x86_64-x86_64/shared/vndk-core/libui.so
index 1f34376..f0cda4c 100755
--- a/x86_64/arch-x86_64-x86_64/shared/vndk-core/libui.so
+++ b/x86_64/arch-x86_64-x86_64/shared/vndk-core/libui.so
Binary files differ
diff --git a/x86_64/arch-x86_64-x86_64/shared/vndk-core/libvorbisidec.so b/x86_64/arch-x86_64-x86_64/shared/vndk-core/libvorbisidec.so
index 2203245..3ffc03a 100755
--- a/x86_64/arch-x86_64-x86_64/shared/vndk-core/libvorbisidec.so
+++ b/x86_64/arch-x86_64-x86_64/shared/vndk-core/libvorbisidec.so
Binary files differ
diff --git a/x86_64/arch-x86_64-x86_64/shared/vndk-core/libxml2.so b/x86_64/arch-x86_64-x86_64/shared/vndk-core/libxml2.so
index 8d525ba..bb5dc21 100755
--- a/x86_64/arch-x86_64-x86_64/shared/vndk-core/libxml2.so
+++ b/x86_64/arch-x86_64-x86_64/shared/vndk-core/libxml2.so
Binary files differ
diff --git a/x86_64/arch-x86_64-x86_64/shared/vndk-sp/libcutils.so b/x86_64/arch-x86_64-x86_64/shared/vndk-sp/libcutils.so
index 86bc523..15dce8c 100755
--- a/x86_64/arch-x86_64-x86_64/shared/vndk-sp/libcutils.so
+++ b/x86_64/arch-x86_64-x86_64/shared/vndk-sp/libcutils.so
Binary files differ
diff --git a/x86_64/arch-x86_64-x86_64/shared/vndk-sp/libhidltransport.so b/x86_64/arch-x86_64-x86_64/shared/vndk-sp/libhidltransport.so
index dcfdc8d..9515764 100755
--- a/x86_64/arch-x86_64-x86_64/shared/vndk-sp/libhidltransport.so
+++ b/x86_64/arch-x86_64-x86_64/shared/vndk-sp/libhidltransport.so
Binary files differ