Merge branch 'armclang-update-version-computation' into release-3.26

Merge-request: !8636