Merge "small cleanup. gEGLImpl should have been static" into kraken