Update stb_image and fix up surface.cpp/surface.h style