To hopefully put it to rest once and for all, Mega Charizard X takes normal damage from water type moves, and knows Thunder Punch which is an electric type move which Greninja is weak against. So had Charizard not mega evolved, Greninja would've won.

I can prove this via Pokémon Showdown.