am db56bb4a: Merge "libcorkscrew: avoid future name collisions."

* commit 'db56bb4aebb2aaa63cf33c2f9868a22ea655b38e':
  libcorkscrew: avoid future name collisions.