am 0c218e43: am 9ca926ad: am fdb87b76: am 127b478a: Merge "Remove all usage of fmin and fmax" into mnc-dev

* commit '0c218e43b8126eaffb38aa24af8e46e22835c3cb':
  Remove all usage of fmin and fmax