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

Change-Id: I647ae1097fc8756971424bd3aa3cb37991045ca5