Merge "Fix a bug where eglMakeCurrent(NULL) did not work"