swift234

[build] Fix iOS bugs, again.

In retrospect testing this directly on the buildbot was not the most efficient approach.


Swift SVN r15497