am 5a606c3a: Merge "Fix EGL shim extension injection for GL ES 3 drivers."

* commit '5a606c3ab9ead418709c0f63940b60347d11e925':
  Fix EGL shim extension injection for GL ES 3 drivers.