Merge "Update to EGL 1.5"