am e2a3e872: Merge "Fix GLES context version selection" into klp-dev

* commit 'e2a3e8727408937bb7107c206444fa49a150f358':
  Fix GLES context version selection