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

* commit 'e0126df2a644e1d1325bc4b43026b5dc25b9ed9b':
  emulator opengl: Added glFinishRoundTrip to GLESv2