am 67032b23: Merge "Fix a bug where eglMakeCurrent(NULL) did not work"

* commit '67032b23966bc0a7231b2d6825ac2f1cf84e9949':
  Fix a bug where eglMakeCurrent(NULL) did not work