am 0677b7a1: am f68103bf: am 1e4d92ca: am 67032b23: Merge "Fix a bug where eglMakeCurrent(NULL) did not work"

* commit '0677b7a1e3e59da389cb78f372818ea8105b092e':
  Fix a bug where eglMakeCurrent(NULL) did not work