[ros-diffs] [pschweitzer] 47870: Fix ARM build