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

Change-Id: Ib711a81687a9b2d4de018d63b6519af0917aa1fa