Merge "Fix SkShader leak for Gradient VectorDrawable and test" into nyc-mr1-dev