Merge "Put back the non-VFP soft float implementations."