am d3ecb3e6: Merge "Switch from fminf/fmaxf to std::min/max" into mnc-dev

* commit 'd3ecb3e6f04a0f76c886238af6bef1d10b987a42':
  Switch from fminf/fmaxf to std::min/max