Merge "ext4_utils: Don't #define error in a major include."