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

Change-Id: Ia5c4e2d772cca666a42ac3617bb8f10081b2aa19