Merge "Fix host build for arm/arm64"