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

Change-Id: I7277c8de69eebd061b093781d78175331493c719