am 779923ae: Merge "Put back the non-VFP soft float implementations."

* commit '779923ae7782a8a7f62b0bc2b2282c136a5a34b9':
  Put back the non-VFP soft float implementations.