am 071f3aaa: am 351c4d55: Merge "emulator Opengl - slight type change for GLESv2"

* commit '071f3aaa15772ad41f0adaabd35ce6c102d2e7aa':
  emulator Opengl - slight type change for GLESv2