Merge "Use -Werror in external/e2fsprogs" am: b3b2b3000b am: f8ee9e2f8e am: 5945c16bad
am: 5925478992

Change-Id: I5daf9abf011d85a49aabca7db63a07a3597a6a08