am c7fb2970: Merge "opengles emulator: GLES2 codec - glFinishRoundTrip"

* commit 'c7fb2970ef5a17cbba2bb406a574b078061d0d50':
  opengles emulator: GLES2 codec - glFinishRoundTrip