am f6544838: Merge "Fix standalone build of native opengl tests" into klp-dev

* commit 'f654483857e19372b64098572721616d31565148':
  Fix standalone build of native opengl tests