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

* commit '11064844ee9ed8123f1e5f815e1982bb3101dc8b':
  opengles emulator: code cleanup removing dead code