am 8066f12a: Merge "opengles emulator: code cleanup removing dead code"

* commit '8066f12a07b050809c62fda1bdae5296e81a4c11':
  opengles emulator: code cleanup removing dead code