Remove the C macros MY_MAX and MY_MIN, use std::max and std::min instead.

Change-Id: I98279af692934d474e8dcd883fc96f816ae33209