Merge "Use -Werror in external/e2fsprogs" am: 3281e889db am: 3db011ff8f
am: 89227d2f4a

Change-Id: I1ae64608bd300c7b652fb55becacd464adbfacb9