am aaa46155: Merge "Reorganize OpenGL renderer tests" into jb-mr2-dev

* commit 'aaa46155ec80f02b37ec858408d7dabbf9bc289a':
  Reorganize OpenGL renderer tests