Merge "qsort.c: take an upstream FreeBSD change."
am: 1d81be51d8

Change-Id: I004401ab92213b17f58c4928f9206b7a678d18c7