Merge "Mostly restore -Werror for macOS build" am: 8e81aecd53

Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/2427203

Change-Id: Idd07dfd53e3f5fbad2a31f91d25b6beaf4fbab44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>