Merge pull request #459 from libretro/revert-458-fixes-for-rpi-compilation