Merge "scapy: Fix conflict of scapy libraries"