Merge "Fix memory leak when creating SkBitmapProcShader"