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

* commit '81973086cf93e84fdbac204a4d9dd06cbe72798c':
  opengles emulator: GLES2 codec - glFinishRoundTrip