merged sdl changes in android