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

Change-Id: I7822cfac1bb647072e808d4b0b7fe412d8fed031