am c0f900b7: am 5f326344: am 025c1f7f: Merge "emulator opengl: Fix bug when re-binding the same context"

* commit 'c0f900b70b108045e67178f714460b06fd1ca4a4':
  emulator opengl: Fix bug when re-binding the same context