swift234

[build] Always self-test gyb when we run it

  This is fast enough to do all the time and will prevent problems like
  the one noted as fixed below.

Also, fix a gyb self-test that had drifted out-of-date.

Swift SVN r14484