Merge "Remove EGL references from CanvasContext header"