Fix iOS build for real.
Merge branch 'fix-ios-tests'.