Merge "Revert "ext4_utils: -Werror""