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

Change-Id: If62e2d89620bc7f464779a3db2c6f977bf34f7de