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

Change-Id: I6551a07961db193c45abc436227a7001b721a81a