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

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