[ros-diffs] [tkreuzer] 47557: [HAL] Include the correct headers for amd64 vs i386