libffi: Merge Darwin fixes from upstream testing