Merge "rework a bit how we manage EGL extensions" into ics-mr1