Merge change 8997

* changes:
  GLESv2 couldn't be loaded due to wrong path specification