Merge "E2fsprogs: fix ODR issue"