Merge "cpio: Turn on -Werror"