Remove image_shape max pool argument.

Run GPU tests and merge after June 6.