Merge "graphics: include graphics-sw.h from graphics.h" into pi-dev