Fixes and bug fixes for CommonCrypto builds.
Merge branch 'bleeding-jumbo' into bleeding-mask

* bleeding-jumbo:
  Fixes and bug fixes for CommonCrypto builds.