Merge "Use -Werror in external/e2fsprogs"
am: b3b2b3000b

Change-Id: I207793b99436a176d5e4fdbf7f290fdd31c7c776