[ros-diffs] [sserapion] 36562: Work around bug 3746. Use arch specific def files.