* Fix remaining bits of issue 17192 for 3.4 - these changes

were missing from a messed up merge during the libffi 3.0.13
  import.  the diffs from upstream libffi 3.0.13 are now small.