Use each CommonCrypto API only when using an OS X SDK version new enough to provide it.
Resolve conflicts by integrating changes from both sides.