Merge "ODR violation in tune2fs during host build"