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

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