openconnect: simplify HEAD build.

Upstream accepted a couple patches that make it easier to build
openconnect under OS X. Let's take advantage of them.