Merge "egl: recover from failed eglMakeCurrent" into oc-dev am: 35c63d456a
am: 9473093ac8

Change-Id: If0865ff627694736f2a242d96e13fe16d8ee461f