Merge "Remove libcorkscrew."