Merge changes I1e6c3c80,I4310618c into main

* changes:
  Fix updatable driver loading issue with Vulkan.
  Fix updatable driver loading issue with EGL.