Merge change 21646 into eclair

* changes:
  fix bug [2021677] egl driver unloaded after eglTerminate() is called