Merge pull request #633 from libretro/revert-631-autoframeskip