am f0baef2f: Merge "EmuGL: misc small cleanups" into ics-mr1

* commit 'f0baef2fed555e87a0910e5aab6b8b763487b350':
  EmuGL: misc small cleanups