am 84fd9bd1: am f8954c81: Merge "OpenGL tests: Fix unused variables"

* commit '84fd9bd151f4aa2392afcb9d7f9e054d035353d5':
  OpenGL tests: Fix unused variables