Merge "ext4_utils: Don't #define error in a major include." am: 850371d273 am: 7c90ebc21f

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1358529

Change-Id: I275c0a3b5043a0b472e39bedfe0b4efe1bd0e659