Fix glitch in Simplify.cpp Max() handling

Should only return early if we substituted a value for expr; if we had
a with a const min and max, and b as a const int, and min_a < b <
max_a, we returned early without ever setting expr to Max::make.
Merge branch 'master' of https://github.com/halide/Halide into gpu_constant_memory