am 390b0753: Merge "emulator opengl: Added glFinishRoundTrip to GLESv2"

* commit '390b0753a9a46de18a1a56662274e7c5ee8b8241':
  emulator opengl: Added glFinishRoundTrip to GLESv2