am df82dcf7: (-s ours) am 779923ae: Merge "Put back the non-VFP soft float implementations."

* commit 'df82dcf7d42e40636ae39d3af7ce2954e5f4e237':