Merge "Remove more hard float crap."
am: 735aab1f1a

Change-Id: I66ac68750fc899aece7c846522c5959b46c08b38