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

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