Merge "ODR violation in resize2fs during host build"