am 23582d7d: am f1340f18: Merge "Remove dependencies on FloatMath"

* commit '23582d7da022aac190dc86e9536d9e5b45a80220':
  Remove dependencies on FloatMath