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

Change-Id: Ia9a56b7c8c20d47e9dcc448c59061784d4edf865