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

* commit '1ca51cba06b962e4ddfff9c731b693d103ba8a5e':
  Allow the host libcorkscrew to build.