Merge "Remove a no-longer-needed workaround from eglMakeCurrent" into pi-dev-plus-aosp