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

Change-Id: Ia335597b43562c2279dc1e5f5b7315cfbe2d2e2c