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

* commit 'c46dbe8ac4748a0084b026524ad9e5ac44fb9fde':
  Use std::sort instead of qsort_r wrapper.