am c8f4b574: Merge "Soft-float cleanup"

* commit 'c8f4b574f7462176fad5a2410b96e2af788df289':
  Soft-float cleanup