Merge pull request #5608 from mono/xcode9_bockbuild_fix