am 05cfccfa: am c8f4b574: Merge "Soft-float cleanup"

* commit '05cfccfaa475d948a14cee208234b6c4723d729e':
  Soft-float cleanup