am 2d3bccde: am 61af820e: am 2317287d: Merge "Remove libcorkscrew."

* commit '2d3bccdedc058e2f9e10d507c43e1da51d32260f':
  Remove libcorkscrew.