Merge "Use -Werror in external/fsck_msdos" am: b212f4da73
am: b901fc09c3

Change-Id: I155929c76d4970d0bc82f55bb14e61d25d6bf0be