Merge "ODR violation in e2fsck during host build"