Merge "fix [2236865] STOPSHIP: bump soft gl and egl minor version number"