Another take on updating to SDL2

More info here: hrydgard/ppsspp#6832