am 7cc315de: am ecd4dd7b: Merge "emulator opengl - ensure server connection for rendering thread"

* commit '7cc315debd14e321d1e2c6b2e5294dc019d2cc3f':
  emulator opengl - ensure server connection for rendering thread