Merge branch 'km/no-apple-common-crypto-on-darwin-8-and-below' into jch