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

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