Merge "Allow the host libcorkscrew to build."