Attempt to fix merge conflict between commits 5640481 and 5545321
Revert "Remove Makefile which is derived from Makefile.in"

This reverts commit 35be4d3a3ea30a636289e3560614269038cff7c6.
Revert "longest_match() implementation for x86-family platform."

This reverts commit d233871cf8189952dccce12976ce0dd7715bb1d2.