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

* commit '61af820e3d7febdb272fdb7f10ec45728828ec21':
  Remove libcorkscrew.