Merge "Update the Khronos EGL and GLES* header files."