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

Change-Id: Iac75de97870717ce3de580d8d20c91a21af9e3ae