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

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