Merge "Use std::sort instead of qsort_r wrapper."