Upstream merge

Syncs libretro tree to upstream, leaving out NEON_PC change.