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

Change-Id: I84acd973962c04ec0834513bac87e70bf3fa385c