Merge pull request #164 from apple/build-fixes-for-darwin-chagnes

Another find/replace issue