Merge "EGL: fix an extension string bug" into jb-mr1-dev