Merge "Revert "Fix libffi issues with dynamic linking""