Merge "Revert "Use -Werror in external/e2fsprogs"" am: 0a4eaed4e0
am: 84c6970f38

Change-Id: I6bcb926a209d170ef4ffe8b5b5846f277dceb45b