Merge pull request #11690 from neheb/libffi