Merge "opengles emulator: code cleanup removing dead code"