[ros-diffs] [cwittich] 25946: fix mkhive on x86_64 hosts