am 7ae23868: am 92e841d0: Merge "Take upstream libm changes."

* commit '7ae23868b4741f9b1af874ebbb13ec3ba930d679':
  Take upstream libm changes.