am 4e90c907: am 65ab88c7: am 21977eb0: Merge change I56981989 into eclair

Merge commit '4e90c907f4fb222901f9db07a1f603c01211868d'

* commit '4e90c907f4fb222901f9db07a1f603c01211868d':
  fix [2231527] Compatibility with SpaceJunk game (OpenGL)