Merge "Remove a no-longer-needed workaround from eglMakeCurrent"