Well, if its in a dictinary from 1787, iy's clear enough that the song idea is wrong. Which doesn't mean it might have been a misundersatnding by Americans at the time as to where the word came from.

It could even have been a joke by a Mexican who was asked what the word meant. "It's from that song you keep on singing."

Which would still leave open the question which of those two songs.