Trump demands new trade deal with Mexico over water rights