am 4d10ed32: Merge "fix a dead-lock in eglMakeCurrent"

* commit '4d10ed3210ef6beb28f525d1a064268b149f0736':
  fix a dead-lock in eglMakeCurrent