Merge "Add dataspace to match upstream EGL extension"