Merge "Use -Werror in external/fsck_msdos"