Merge topic 'fileapi-defer-static-init'

bfacb49154 fileapi: Make internal "toolchains" field tables more local

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6894