Merge "aapt: move qsort_r_compat here as it is sole client"