Merge "Remove redundant EGL header"