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

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