Merge "Update skia framework to use new MakeFromTexture calls"