diff --git a/Android.bp b/Android.bp
index cf19482..372801c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -2526,6 +2526,7 @@ cc_prebuilt_library_shared {
"proprietary/vendor/lib/libnvram.so",
],
shared_libs: [
+ "libbase_shim",
"libcutils",
"libcustom_nvram",
"libnvram_platform",
@@ -2543,6 +2544,7 @@ cc_prebuilt_library_shared {
"proprietary/vendor/lib64/libnvram.so",
],
shared_libs: [
+ "libbase_shim",
"libcutils",
"libcustom_nvram",
"libnvram_platform",
@@ -3049,6 +3051,7 @@ cc_prebuilt_library_shared {
"proprietary/vendor/lib/libsysenv.so",
],
shared_libs: [
+ "libbase_shim",
"liblog",
"libbase",
"libc++",
@@ -3062,6 +3065,7 @@ cc_prebuilt_library_shared {
"proprietary/vendor/lib64/libsysenv.so",
],
shared_libs: [
+ "libbase_shim",
"liblog",
"libbase",
"libc++",
diff --git a/RM6785-vendor.mk b/RM6785-vendor.mk
index 3ef2395..bc7e779 100644
--- a/RM6785-vendor.mk
+++ b/RM6785-vendor.mk
@@ -319,9 +319,6 @@ PRODUCT_COPY_FILES += \
vendor/realme/RM6785/proprietary/vendor/etc/ipsec/ssl/openssl.cnf:$(TARGET_COPY_OUT_VENDOR)/etc/ipsec/ssl/openssl.cnf \
vendor/realme/RM6785/proprietary/vendor/etc/ipsec/strongswan.conf:$(TARGET_COPY_OUT_VENDOR)/etc/ipsec/strongswan.conf \
vendor/realme/RM6785/proprietary/vendor/etc/libnfc-nxp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nxp.conf \
- vendor/realme/RM6785/proprietary/vendor/etc/media_codecs_mediatek_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_mediatek_audio.xml \
- vendor/realme/RM6785/proprietary/vendor/etc/media_codecs_mediatek_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_mediatek_video.xml \
- vendor/realme/RM6785/proprietary/vendor/etc/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml \
vendor/realme/RM6785/proprietary/vendor/etc/mpe.conf:$(TARGET_COPY_OUT_VENDOR)/etc/mpe.conf \
vendor/realme/RM6785/proprietary/vendor/etc/mtk_omx_core.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/mtk_omx_core.cfg \
vendor/realme/RM6785/proprietary/vendor/etc/nhw:$(TARGET_COPY_OUT_VENDOR)/etc/nhw \
diff --git a/proprietary/vendor/etc/media_codecs_mediatek_audio.xml b/proprietary/vendor/etc/media_codecs_mediatek_audio.xml
deleted file mode 100644
index d63cd0a..0000000
--- a/proprietary/vendor/etc/media_codecs_mediatek_audio.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/proprietary/vendor/etc/media_codecs_mediatek_video.xml b/proprietary/vendor/etc/media_codecs_mediatek_video.xml
deleted file mode 100644
index 6b81d97..0000000
--- a/proprietary/vendor/etc/media_codecs_mediatek_video.xml
+++ /dev/null
@@ -1,228 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/proprietary/vendor/etc/media_profiles_V1_0.xml b/proprietary/vendor/etc/media_profiles_V1_0.xml
deleted file mode 100644
index 9b2817d..0000000
--- a/proprietary/vendor/etc/media_profiles_V1_0.xml
+++ /dev/null
@@ -1,1710 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-]>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/proprietary/vendor/lib/libnvram.so b/proprietary/vendor/lib/libnvram.so
index 9836a70..dd6ec33 100644
Binary files a/proprietary/vendor/lib/libnvram.so and b/proprietary/vendor/lib/libnvram.so differ
diff --git a/proprietary/vendor/lib/libsysenv.so b/proprietary/vendor/lib/libsysenv.so
index 4979f1e..1aff798 100644
Binary files a/proprietary/vendor/lib/libsysenv.so and b/proprietary/vendor/lib/libsysenv.so differ
diff --git a/proprietary/vendor/lib64/libnvram.so b/proprietary/vendor/lib64/libnvram.so
index f1df82a..c40d892 100644
Binary files a/proprietary/vendor/lib64/libnvram.so and b/proprietary/vendor/lib64/libnvram.so differ
diff --git a/proprietary/vendor/lib64/libsysenv.so b/proprietary/vendor/lib64/libsysenv.so
index c4eb36b..944c70c 100644
Binary files a/proprietary/vendor/lib64/libsysenv.so and b/proprietary/vendor/lib64/libsysenv.so differ