Was it Mayan belief or Aztec that told of a white god coming or Aztec adoption of Mayan?

Neither. The widespread misconception that Aztecs believed in a messianic Quetzalcoatl in the form of a white man is more widespread and insidious than "Hippies spitting on GI's returning from Vietnam".