Merge "Revert "Use -Werror in external/e2fsprogs""