Actually build against contrib's SDL2 headers.

How this built before, I have no idea.
Bump sdl2-image contrib, allowing x86 Android target again.

Hooray.