am 9979ae43: Merge "Remove HAVE_(GNU|BSD)_QSORT_R from AndroidConfig.h."

* commit '9979ae4370e7acd4b305fddeca3c24495214a0cf':
  Remove HAVE_(GNU|BSD)_QSORT_R from AndroidConfig.h.