Merge pull request #16571 from skatsuta/fix-typo-comment-evaluator

builder: fix typos in comments