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

* commit '436dc98c3d8f803e3f14cdc1193048240c7a31e7':
  opengles emulator: code cleanup removing dead code