am 2317287d: Merge "Remove libcorkscrew."

* commit '2317287d18fae3f9ae0f3beb7748a804f06b5720':
  Remove libcorkscrew.