Some headers are including SkMtrix.h, fix compilation errors for them.