* upstream-curl: curl 2016-08-03 (f2cb3a01)
Re-apply the logic change made by commit v2.8.2~536 (Use arch-aware CHECK_TYPE_SIZE result, 2009-12-17). The size of some types must be selected at preprocessing time when building for multiple archs on OS X.
Resolve all conflicts in favor of the upstream side. We can re-apply specific changes later.