Merge "Fix SkShader leak for Gradient VectorDrawable and test" into nyc-mr1-dev am: 269f76a7d2 am: 64d24d6631
am: d3725ee017

Change-Id: I54c6cf0b207c83eb647550199572b21be6504973