am 22a289a0: am 7112e4c7: Merge "Remove the dead corkscrew header files too."

* commit '22a289a0b6fcb1c0edc372e477c876819749addd':
  Remove the dead corkscrew header files too.