Bug 974900 - Add missing include guards to Skia headers - r=gw280
Bug 974900 - #undef interface defined by windows headers - r=gw280
Bug 974900 - re-unify the Skia build - r=ehsan