Merge "Remove more hard float crap." am: 735aab1f1a am: c730b84f7c am: 0510189cbd
am: b14a638435

Change-Id: I4c2bb69f964508640565664a4576654142fd30e2