Merge "Remove obsolete libffi"