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

Change-Id: I85a66465e2bfbb60bb142144f4117b0009288915