am b3c8c4d8: Merge "Switch to current FreeBSD qsort."

* commit 'b3c8c4d8654894cdc72d32bde84a520ccda4d8f3':
  Switch to current FreeBSD qsort.