Merge "egl: handle failed eglMakeCurrent EGL_NO_CONTEXT" into oc-dev
am: 2153f5e317

Change-Id: I6c36e59dc595bd6a494561a49b98b0f2d479ecfe