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

Change-Id: I2710b5d0795291e376d62f008680755c3c177acb