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

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

Change-Id: I51ba74f1afe0749be99e740114cd56a1a33d6e32