Merge "Revert "Update the Khronos EGL header files."" into main