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

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