[ros-dev] Merging our x86 HALs