Merge change Icf335098 into eclair

* changes:
  fix [2236865] STOPSHIP: bump soft gl and egl minor version number