Merge "Use -Werror in external/e2fsprogs"