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

Change-Id: Id8b087e980ba530d80abb45fa743c64e9a6215c1