Merge "Fix build warnings and make build warnings be errors"