Merge change I6261ab54 into eclair

* changes:
  Revert "egl: temporarily also include eglTerminate->eglInitialize hack for 8k"