(360) Build fix
Merge branch 'master' of https://github.com/libretro/RetroArch
Merge branch 'master' of https://github.com/libretro/RetroArch
Merge branch 'master' of https://github.com/libretro/RetroArch
(360) Build fixes