Merge "Add -Werror flag to catch more warnings and errors"