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

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

Change-Id: If5210ba90d66399ded2b1bcb181bf06af6ff808e