am 26dcecb0: Merge "Follow-up CL after hard float changes."

* commit '26dcecb0ef620fb225cd5dd39f6e41b07e34c83d':
  Follow-up CL after hard float changes.