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

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