Multiarch Fixes - heimdal

No unpublished successful runs for heimdal.