[ros-diffs] [tkreuzer] 35444: add an additional case for _AMD64_ now that we have _X86_ not defined anymore