am 525155ac: Merge "Allow the host libcorkscrew to build."

* commit '525155ac49bae98e9f50ce667609c32eeccc80be':
  Allow the host libcorkscrew to build.