am 8899df42: (-s ours) am 6270f6f9: Merge "Improve OpenGL test reliability" into jb-dev

* commit '8899df42eecf0f214404b5963d6d005ac00baecc':
  Improve OpenGL test reliability