Merge commit '98b3def2' into eclair-mr2 * commit '98b3def2': Revert "egl: temporarily also include eglTerminate->eglInitialize hack for 8k"