Move from MAX/MIN to std::max/std::min

Change-Id: I2296a39ab1fb9c02575702476170a2f68d7de02f
2 files changed