Merge 3c40afbd on remote branch

Change-Id: I2b6726e8b06ba267d77bb684282e459060eda75a

conf_files/msmnile/media_codecs_performance.xml

@@ -44,8 +44,8 @@ limitations under the License.
         <MediaCodec name="OMX.qcom.video.encoder.mpeg4sw" type="video/mp4v-es" update="true">
             <Limit name="measured-frame-rate-176x144" range="299-299" />
             <Limit name="measured-frame-rate-352x288" range="245-245" />
-            <Limit name="measured-frame-rate-640x480" range="55-56" />
-            <Limit name="measured-frame-rate-1280x720" range="13-14" />
+            <Limit name="measured-frame-rate-640x480" range="165-170" />
+            <Limit name="measured-frame-rate-1280x720" range="68-75" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.vp8" type="video/x-vnd.on2.vp8" update="true">
             <Limit name="measured-frame-rate-320x180" range="363-484" />
@@ -205,7 +205,7 @@ limitations under the License.
         <MediaCodec name="c2.android.vp9.decoder" type="video/x-vnd.on2.vp9" update="true">
             <Limit name="measured-frame-rate-320x180" range="415-575" />
             <Limit name="measured-frame-rate-640x360" range="200-450" />
-            <Limit name="measured-frame-rate-1280x720" range="89-90" />
+            <Limit name="measured-frame-rate-1280x720" range="269-280" />
             <Limit name="measured-frame-rate-1920x1080" range="28-38" />
         </MediaCodec>
         <MediaCodec name="c2.android.h263.decoder" type="video/3gpp" update="true">

libc2dcolorconvert/C2DColorConverter.cpp

-/* Copyright (c) 2012 - 2018, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012 - 2018,2021, The Linux Foundation. All rights reserved.
  *
  * redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -52,14 +52,14 @@ C2DColorConverter::C2DColorConverter()
 
     pthread_mutex_init(&mLock, NULL);
 
-    mC2DLibHandle = dlopen("libC2D2.so", RTLD_NOW);
+    mC2DLibHandle = dlopen("libC2D2.so", RTLD_NOW | RTLD_NODELETE);
     if (!mC2DLibHandle) {
         ALOGE("%s: ERROR: could not dlopen libc2d2.so: %s. C2D is disabled.",
                                                     __FUNCTION__, dlerror());
         enabled = false;
         return;
     }
-    mAdrenoUtilsHandle = dlopen("libadreno_utils.so", RTLD_NOW);
+    mAdrenoUtilsHandle = dlopen("libadreno_utils.so", RTLD_NOW | RTLD_NODELETE);
     if (!mAdrenoUtilsHandle) {
         ALOGE("%s: ERROR: could not dlopen libadreno_utils.so: %s.. C2D is disabled.",
                                                     __FUNCTION__, dlerror());