[ros-diffs] [fireball] 24989: Fix HALMP build