Fix GNU/kFreeBSD x86-64 and add x86 support.

The x86-64 patch wasn't fully merged and couldn't be built.
x86 needed a similar simple replacement __FreeBSD__ => LISP_FEATURE_FREEBSD.

Also add :gnu-kfreebsd feature for easier differentiation.