am 91d01e5d: am 0cec5293: am d7580333: Merge "Use std::sort instead of quickSortX" into mnc-dev

* commit '91d01e5d8b9a50ad04f0d0b5d6e35885f5d878a3':
  Use std::sort instead of quickSortX