Bug 939629 - 1/2. Add missing include guards to a couple of Skia headers - r=gw280
Bug 939629 - 2/2. Build Skia in unified mode - r=ehsan,gw280