Merge "Fix a bug that prevented the creation of EGL shared contexts."