Merge change I0953c1d5 into eclair

* changes:
  fix [2153873] EGL-1.4 software implementation misses surface attributes