Merge "Fix SkShader leak for Gradient VectorDrawable and test" into nyc-mr1-dev am: 269f76a7 am: 64d24d66 am: d3725ee0 Change-Id: I54c6cf0b207c83eb647550199572b21be6504973