Merge "Replace SkTMax with std::max"