am a82f4483: (-s ours) Merge "Make LTE_FLOAT a strict weak order. (DO NOT MERGE) Bug: 5327776" into ics-factoryrom

* commit 'a82f448373ca0f0e67fb52a2bdc489c4ed0b17ac':
  Make LTE_FLOAT a strict weak order. (DO NOT MERGE) Bug: 5327776