Merge "reboot: Turn on -Werror"